added display function overide to each of the
Merge origin/master

Conflicts:
	crazyConnectFour/src/CIT260/PairedProgramming/CrazyConnectFour/Views/GamePreferencesMenuView.java
Merge origin/master