added google maps api key to index and geocode object to controllers as well
as proposed reverse geocode code commented out to work off of
Add dynamic coffee mugs to map (based on location of user)
refactor code and cleanup - no changes to functionality
Merge pull request #27 from ASwitlyk/feat/reverse_geocode

(feat) Markers of cafes show up on map and have customized logos.
no changes made
(feat) Make markers clickable. Show google maps infowindow on click
(feat) Open highest rating infoWindow when centered on user.
(fix) Fix bug so highest rating business displays on centering
Merge pull request #31 from kayellpeee/feat/recommendationBar

Feat/recommendation bar
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
Add recommend list item above footer
no changes made
Add recommend list item above footer
Merge pull request #32 from ASwitlyk/feat/recommend_list

Feat/recommend list
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup
(feat) Add user location represented as a circle to map
(feat) Add distance from user to each coffee location
Merge pull request #33 from kayellpeee/feat/calculateDistance

(feat) Add distance from user to each coffee location
Merge branch 'master' of https://github.com/SmoothBrew/Fillmeup

Conflicts:
	client/app/scripts/controllers.js
conflict resolve with upstream