fixed issue, seems like logic is still off though
Merge remote-tracking branch 'origin/master'

Conflicts:
	Models/AI.cs