Trying to iron out login issues: Still comming up with errors.
Merge branch 'Login-Test-Branch'

Conflicts:
	Project/bin/classes/com/icbc/crossroads/MainMenu.class
	Project/src/com/icbc/crossroads/MainMenu.java