new test
Merge branch 'master' of github.com:dyep49/time-midpoint into development
new commits
git stuff
fixed merge conflict
git stuff
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge pull request #17 from jtrope89/master

Modifying location.js Location model to work with one parameter which can be a Yelp or ActiveRecord Object.
updated mapnificent api test
Merge branch 'master' of github.com:dyep49/time-midpoint into development
removing category field from js location model
adding multiple markers that drop oh so nicely
marker stuff
Merge branch 'master' of github.com:dyep49/time-midpoint into development