Merge branch 'master' into Emily
loginfunction b4 gui
login
guiuppdateringar

fixa buggar
Merge branch 'master' into Tobias
Fixat i passmetoder
Merge branch 'Tobias'
Lagt till ny panel och början på ett AI
Merge branch 'master' into Emily
Merge branch 'Emily'
Merge remote-tracking branch 'origin/Anna'
Merge branch 'master' of https://github.com/essob/Client1

Conflicts:
	ClientController.java
	ClientGUI.java
	NewUser.java
about us button