update choose
update choose
Merge branch 'master' of https://github.com/woinck/DS15-dev

Conflicts:
	PlayerFiles/ai.cpp
	PlayerFiles/clientai.cpp