added global boolean for turn
merge
changes textview
removed sysout
added toast for not your turn
merge
merge
small change
old changes from last time
small change
fixed a but with pegs i method getKeyPegs() in the colorPegSolutionSequence class
Merge branch 'setopponentkeypegs'
Merge branch 'setopponentkeypegs' into turnBased

Conflicts:
	MindMaster/src/main/java/no/group3/mindmaster/Network/UpdateUIThread.java
	MindMaster/src/main/java/no/group3/mindmaster/Views/GameScreen.java
Merge branch 'master' into turnBased

Conflicts:
	MindMaster/src/main/java/no/group3/mindmaster/Views/GameScreen.java
	MindMaster/src/main/res/layout/game_screen.xml
Merge branch 'networkfix' into turnBased
Status fungerer
Game screen
Merged and fixed merge conflicts with turnBased branch
Merge branch 'networkfix' of https://github.com/rtc11/mindmaster into networkfix