login GUI
Merge branch 'Tobias'
Merge branch 'Tobias'
merge master to Anna
Stor bokstav
Merge branch 'master' into Tobias

Conflicts:
	ClientController.java