merge and collisionCheck now works
Merge remote-tracking branch 'origin/master'

Conflicts:
	TDDC69-lab2/lab2/src/se/liu/ida/hansn314/tddc69/lab2/Board.java