Fixed Coding Conventions

Fixed most coding conventions in the ConnectFourGame.java
Merge branch 'master' of https://github.com/jbrookdale/GroupAGSAssignment5

Conflicts:
	ConnectFourGame.class