ugh github
Merge branch 'master' of github.com:dschen/roommeet

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js