Fixed typos
Add .gitignore
Merge branch 'master' of https://github.com/johnASebastian/bearded-cyril

Conflicts:
	python/ZoneManager.py