Fixing board
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/grouplab/Board.java
fixing git's random edits
Merge branch 'master' of https://github.com/atamis/flaming-cyril