Some more changes
Merge branch 'master' of https://github.com/GSam/Cluedo

Conflicts:
	src/swen222/cluedo/Board.java
Change rooms to add entrances, may change how entrances work later.