Remove pyc junk. oops
Merge branch 'master' of github.com:Autumn/cammap into autumn
index in flask dir
Merge remote-tracking branch 'origin/autumn'
Merge pull request #1 from Autumn/autumn

Autumn
Merge branch 'master' of ssh://github.com/Autumn/cammap
Fix index
patched index to include marker