Stuff
Merge branch 'master' of https://github.com/aleksanw/Systemutvikling-fellesprosjekt.git
Merge branch 'master' of
https://github.com/aleksanw/Systemutvikling-fellesprosjekt

Conflicts:
	src/server/storage/Storage.java