removed som uneccesary waiting on sendmesage
Merge branch 'master' of github.com:rtc11/mindmaster
Some cleanup in Controller.java
Added method for getting the keypegs for the current guess in GameScreen and Controller
Added drawable folder
added colors
Rolig
Added adapter functionality that does not work, with a layour for rows in spinner
starts gamescreen on host but not on client
Funksjonalitet for spinner mot modell
Images fo pegs with adapter are fixed for spinners
network changes
random changes
fixed two ways communication
Merge branch 'spinnerfix' into spinnermodelconnection

Conflicts:
	MindMaster/src/main/java/no/group3/mindmaster/Controller/Controller.java
	MindMaster/src/main/java/no/group3/mindmaster/Views/GameScreen.java
Merge branch 'master' into spillskjerm

Conflicts:
	MindMaster/src/main/java/no/group3/mindmaster/Controller/Controller.java
	MindMaster/src/main/java/no/group3/mindmaster/Views/GameScreen.java