MainController change
Merge remote-tracking branch 'origin/businesslogic' into ui

Conflicts:
	src/ca/csf/minesweeper/MainController.java
	src/ca/csf/minesweeper/Minesweeper.java
	src/ca/csf/minesweeper/MinesweeperObserver.java
Merge remote-tracking branch 'origin/businesslogic' into ui
Merge remote-tracking branch 'origin/ui' into test

Conflicts:
	src/ca/csf/minesweeper/Minesweeper.java
	src/ca/csf/minesweeper/MinesweeperObserver.java