Random changes
Merge branch 'controllerTest' of https://github.com/ktn/Iter2 into controllerTest

Conflicts:
	src/InputListener.java
"Set turnphase"
added repaints to other board methods.
Merge branch 'controllerTest' of https://github.com/ktn/Iter2 into controllerTest
 and tried to get hilight working
Conflicts:
	src/InputListener.java
	src/View.java
	src/runGame.java
Merge branch 'view' of https://github.com/ktn/Iter2 into controllerTest

Conflicts:
	src/runGame.java
Merge branch 'controllerTest' of https://github.com/ktn/Iter2 into controllerTest
Fix hilighting and two block not joining correctly