minor
Merge branch 'master' of https://github.com/adishr09/Fervour_2014

Conflicts:
	2nd_homepage/home_page.html
	2nd_homepage/img/on.png