loginfunction b4 gui
login
Merge remote-tracking branch 'origin/master' into Anna
kopplat database till newUser
changed to only username and password

ch
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
Merge branch 'master' into Tobias