first commit
Merge branch 'master' of https://github.com/n4nagappan/foodfromheart

Conflicts:
	css/bootstrap.css
	css/simple-sidebar.css
	js/jquery-1.10.2.js
	js/render-map-route.js
	profile.html
	route.html