Fixed Broken Coding Conventions

Fixed the broken coding conventions in GUI.java
Committing class

Committing class, this does not change anything, but allows me to get
the latest sync.
Merge branch 'master' of https://github.com/jbrookdale/GroupAGSAssignment5

Conflicts:
	ConnectFourGame.class