Home map
Merge branch 'master' of https://github.com/phalgun1/465foodtruck

Conflicts:
	App/www/js/controllers.js