it wont let me pull?
Merge branch 'master' of
https://github.com/whitesweta/Cluedo-Swen222-Assignment.git

Conflicts:
	Cluedo222/src/cluedo/ui/Board.java
added a canvas.repaint() at the end of ending a turn