Changed to be something else
nytt pill
La till baksidor i GUI
Rolf fixa! :D
just bbq
just bbq
make it right
fff
Databas update
Merge branch 'Anna' of https://github.com/essob/Client1 into Anna

Conflicts:
	ClientController.java
	ClientGUI.java
Merge remote-tracking branch 'origin/master' into Anna
Merge branch 'Anna' of https://github.com/essob/Client1 into Anna