fixing bad merge
fixing bad merge, try 2
merging with master
Merge branch 'master' of github.com:dssg/bikeshare
saving progress before moving to circle markers
Merge branch 'master' of github.com:dssg/bikeshare
Merge branch 'master' of github.com:dssg/bikeshare
readding deleted files
Merge pull request #43 from dssg/readding-files

Readding files