styling
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
took out bug that causes markers to not work.
Merge pull request #39 from jtrope89/master

Markers were fucked up before, now they should work.
precompile asset false
can input activity
Merge branch 'master' of github.com:dyep49/time-midpoint
created env variable google map
changed Location to MyLocation
pushing to heroku
fixing app
Merge pull request #41 from dlopezh/master

almost working in heroku
added distance
Merge branch 'master' of github.com:dyep49/time-midpoint
improving distance search
removed alerts
taking out broken shit
Merge pull request #43 from jtrope89/master

i desire to be merged
yelp again