Merge branch 'master' into Emily
Merge branch 'master' into Emily
Merge branch 'master' into Emily
la lite konstruktor i AI
Pillade med GUI
Merge branch 'master' into Emily
flyttat gui
Merge branch 'Tobias' into Emily
Merge branch 'master' into Emily
take it away
Merge branch 'Tobias'
Merge branch 'master' into Emily
Lagt till konstruktör i Rules
Change of table
Merge branch 'master' of https://github.com/Elmseld/sjuan
Merge branch 'Tobias'
Börjat pilla i Rules
små rättelser i rules
test
Merge branch 'Emily' of https://github.com/Elmseld/sjuan into Emily

Conflicts:
	Controller.java
	Response.java
	Server.java