Added deal/user logic to map distance and and trigger alerts when user is in deal vicinity
Merge branch 'dealJSLogic'
angular factory setup
Merge branch 'angularfactory'
added dealmap.html
Merge branch 'maptemplate'
Added seed data
Merge branch 'seedData'
angular expressions working now on dealmap.html
Merge branch 'angularapi'
Merge branch 'master' of https://github.com/NamNguyen52/GeoDeals

Conflicts:
	config/routes.rb

ý5:q
fixed redirects upon user sign up