blegh
Merge branch 'master' of github.com:d136o/dreamatrix

Conflicts:
	src/com/example/thamatrix/DreamatrixView.java