Not Im
fixes
Merge branch 'master' of https://github.com/Ian9802/Console_Wars

Conflicts:
	Console_Wars/src/console_wars/Player.java