more useless stuff

d dhbdzf htfdsh
Merge remote-tracking branch 'origin/master'

Conflicts:
	AI_assn_1/AI_assn_1/mian.cpp