AI2
Merge branch 'master' of https://github.com/pi0/MSP

* 'master' of https://github.com/pi0/MSP:
  new AI

Conflicts:
	.idea/workspace.xml
	src/msp/game/AI.java