okok
Merge branch 'master' of
https://github.com/AntonJakobsson/Datasakerhet.git

Conflicts:
	src/client/gui/RecordChooseWindow.java
Merge branch 'master' of https://github.com/AntonJakobsson/Datasakerhet.git