Merge branch 'master' into Tobias
about us button
jobb med AI och knapp för en spelare
Merge branch 'master' into Tobias
Merge branch 'Tobias'
Merge branch 'Emily'

Conflicts:
	ClientGUI.java
Inte klar med AI
Merge branch 'Emily' into Perfect-master
version som skickats till rolf
AI(ej klar)
kkk
AI snurr
AI (ta emot kort ej klar)
AI(funkar) endats happy testing testad
AI
Merge branch 'Tillsnygging' into Tobias2

Conflicts:
	AboutUs.java
	ChoicePanel.java
	ClientController.java
	ClientGUI.java
AI
Merge branch 'Tobias2' into Tobias
grafik uppdateras oftare
Merge branch 'Tobias'

Conflicts:
	ChoicePanel.java
	ClientController.java
	ClientGUI.java