Merge origin/master

Conflicts:
	crazyConnectFour/nbproject/project.properties
	crazyConnectFour/src/CrazyConnectFourViews/GameMenuView.java
	crazyConnectFour/src/CrazyConnectFourViews/GamePreferencesMenuView.java
	crazyConnectFour/src/CrazyConnectFourViews/HelpMenuView.java
	crazyConnectFour/src/CrazyConnectFourViews/MainMenuView.java
	crazyConnectFour/src/CrazyConnectFourViews/Menu.java
Merge origin/master

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

Conflicts:
	crazyConnectFour/src/CIT260/PairedProgramming/CrazyConnectFour/Controls/CrazyConnectFour.java