Update 8.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Assignment4/Block.java
	src/Assignment4/Mines.java
	src/Assignment4/MinesweeperGUI.java