Merge branch 'master' of github.com:Autumn/cammap into autumn
index in flask dir
patched index to include marker
Merge branch 'autumn' of github.com:Autumn/cammap