change code things
Merge branch 'master' of https://github.com/Toxoplasma/oosAI

Conflicts:
	project.py