update
Merge branch 'master' of https://github.com/NAH2/Assignment4

Conflicts:
	Cs-235 Game/bin/Player/HumanPlayer.class
	Cs-235 Game/bin/Player/Player.class
	Cs-235 Game/bin/boardGame/ConnectFour1.class
	Cs-235 Game/src/boardGame/ConnectFour1.java
	GUIDisplay/SelectGame.java
update
Merge branch 'master' of https://github.com/NAH2/Assignment4