still some bugs
Merge branch 'master' of github.com:Ian9802/Console_Wars
broken
Merge branch 'master' of github.com:Ian9802/Console_Wars

Conflicts:
	Console_Wars/src/console_wars/Game.java
working?
Merge branch 'master' of github.com:Ian9802/Console_Wars

Conflicts:
	Console_Wars/src/console_wars/Units.java