markers on the map with hardcoded objects
fixed merged conflict
fix minor gem/json bug and removed old js file
Merge pull request #14 from jsuich/new_branch

Added JS for adding markers to /mao