Small bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project_MIN04SOB/src/nl/avans/min04sob/scrabble/models/GameModel.java
Merge branch 'master' of https://github.com/Avans/Super-Sexy-Wordfeud.git
Progress towards auto updating game
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project_MIN04SOB/src/nl/avans/min04sob/scrabble/views/BoardPanel.java
Merge branch 'master' of https://github.com/Avans/Super-Sexy-Wordfeud.git