home
Merge branch 'master' of https://github.com/arshadansari27/fitranginew

Conflicts:
	app/templates/feature/home.html
home with blue bar