Merge origin/master

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