Put in maps and some page layout stuff
Merge branch 'master' of github.com:vuphamcs/shelter_finder

Conflicts:
	app/views/devise/registrations/new.html.haml