Uncommits

(may cause bugs)
Merge remote-tracking branch 'origin/master'
Uncommits
Conflicts:
	ai.py