Merge branch 'master' of github.com:dyep49/time-midpoint
to push
Merge branch 'master' of github.com:dyep49/time-midpoint
Merge branch 'master' of github.com:dyep49/time-midpoint
adding crud js
Merge pull request #12 from dlopezh/master

fixed google key thingy
using lopez's application.html.erb
Merge branch 'master' of github.com:dyep49/time-midpoint into development
adding results map partial to index
Merge pull request #13 from jtrope89/master

adding results map partial to index
Merge pull request #14 from Plunkett112358/master

location crud to be altered with johnathan
mergin the two ideas
Merge pull request #15 from jtrope89/master

Adding geocoding to non-yelp location js model
changed layout sign up form