borta
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand

Conflicts:
	test.java