Utökat AI-metoder, rensat upp bland variabelnamnen
Merge branch 'master' into Emily
nya variabelnamn
Merge branch 'master' into Emily

Conflicts:
	ClientGUI.java
Tillsnyggning
Merge branch 'Emily' into Perfect-master
version som skickats till rolf
AI
Merge branch 'Tillsnygging' into Tobias2

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