nega scout
Merge branch 'master' of github.com:rybmat/AIGames

Conflicts:
	OurPlayer/src/main/java/put/ai/snort/ourplayer/OurPlayer.java