added info window to googlemap
Merge branch 'master' of https://github.com/stevebosworth/beer_me

Conflicts:
	app/scripts/controllers/main.js