commit to prep merge
Fix merge conflicts
merging files
Merge pull request #5 from vivekmgeorge/master

merging a clean version of our files with computer usage info
shows markers for multiple map items
Merge branch 'master' of github.com:red-spotted-newts-2014/bike-path