log is two inages now
playing with layout
Merge branch 'master' of github.com:dyep49/time-midpoint
nav bars
Merge branch 'master' of github.com:dyep49/time-midpoint
formatting
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint
adding a special array for db locations and having those pushed in the location model
formatting
Merge pull request #28 from jtrope89/master

adding a different collections array for non yelp location objects
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge pull request #29 from dlopezh/master

working mvp
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint
showing 5 markers on yelp map
fixing bug in infowindows
partials and css
Merge pull request #30 from Plunkett112358/master

partials
setting midpoint of map to be a yelp location