Fyrsta setning
Merge branch 'master' of https://github.com/hsb/fsnilld
Merge branch 'master' of https://github.com/hsb/fsnilld

Conflicts:
	java/stuff
Merge branch 'master' of https://github.com/hsb/fsnilld