Login functionality revised
Merge branch 'login' of https://github.com/CSc436/Project-4x.git into
login

Conflicts:
	src/com/client/gameinterface/GameInterface.java
	src/com/client/model/ClientModel.java
	src/com/server/SimpleSimulatorImpl.java
Got logging in/game init working
Login now displaying on interface
- Comments and cleaning up code
Committing to pull
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev

Conflicts:
	src/com/client/model/ClientController.java
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Got trade manager to not be null
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev

Conflicts:
	src/com/client/PlayGame.java
	src/com/client/gameinterface/GameInterface.java