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
New changes to master - commiting to local repo?
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