småting
asdf
Merge branch 'master' of https://rakrogh@github.com/bokormen/IT1901.git

Conflicts:
	src/div/SheepRegistration.java