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
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
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
Merge pull request #23 from Plunkett112358/master

yelp_location and location crud
objectifying maps
Merge branch 'master' of github.com:dyep49/time-midpoint into development
synching infowindow event with end of markers being dropped