Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
mapnificent ready to go to main
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge pull request #21 from jtrope89/master

Maps should work upon calling YELP()....still need to code in the midpoint and category (hardcoded right now)
Merge branch 'master' of github.com:dyep49/time-midpoint into development
added new model, migrated, altered yelp_locations but not main js yet
added location.js crud stuff
stage one of js merge completed, user input passing to mapnificent
location.js and more crud stuff
Merge pull request #22 from dlopezh/master

stage one of js merge completed, user input passing to mapnificent
about to pull new main js
Merge branch 'master' of github.com:dyep49/time-midpoint into development
added mapnificent dependcies to layouts
added size to mapnificent map
all yelp_location and location crud done
Merge branch 'master' of github.com:dyep49/time-midpoint into development