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

Conflicts:
	Connect4GUI.java
	GUI.java
	Game.class
	GameController.java
	OthelloGUI.java
	Player/HumanPlayer.java
	Player/Player.java
	SelectGame.java
	Selection.java
	boardGame/BoardGame.java
	boardGame/ConnectFour.java
	empty.png
	icon.png
	piece/ConnectFourPiece.java
	piece/GamePiece.java
	piece/OthelloPiece.java