minor css changes
Merge branch 'master' of https://github.com/nfeliciano/mangiamo
Merge branch 'master' of https://github.com/nfeliciano/mangiamo
Merge branch 'master' of https://github.com/nfeliciano/mangiamo
Merge branch 'master' of https://github.com/nfeliciano/mangiamo
Merge branch 'master' of https://github.com/nfeliciano/mangiamo
Reworking map
Merged, map almost working stupid scolling thing is broken.
merging with master
Merge remote-tracking branch 'origin/master' into ReworkingMap
New changes to master - commiting to local repo?
For Lloyd
Working updated map,
Working updating map, ie scroll 2k and it will recall radarsearch
ready to start calling mealservice
headway on modals... still need to give them $scope somehow.
Merge remote-tracking branch 'origin/workingModals' into ReworkingMap

Conflicts:
	app/client/js/controllers/main-controller.js
Changes to make calls work
refactoring meal service to http requests
Refactored userService with
ignore this commit, using it before merge
merging