Merge pull request #4 from mhuerster/master

Add ability to display markers on map
Merge branch 'master' of github.com:red-spotted-newts-2014/bike-path