Cursory image checking
Fix merge conflict
Gitignore
Merge branch 'json' of github.com:Autumn/cammap into autumn

Conflicts:
	backend/serv.py