Damm
Merge remote-tracking branch 'origin/mathmania'

Conflicts:
	src/no/kjelli/damm/Damm.java
	src/no/kjelli/damm/board/Board.java
	src/no/kjelli/damm/board/Tile.java
Merge remote-tracking branch 'origin/mathmania-newsprites3000'
Merge branch 'master' into mathmania-encryptedblocks