Akhilesh Darjee 20659d1346 [docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

..

docs.user.five_day_setup.day_1.md

…

docs.user.five_day_setup.day_2.md

…

docs.user.five_day_setup.day_3.md

…

docs.user.five_day_setup.day_4.md

…

docs.user.five_day_setup.day_5.md

…

docs.user.five_day_setup.md

…