Huge update batch
Merge branch 'master' of ssh://git@github.com/Gruppe21/exph0001.git

Conflicts:
	it1901g21/src/GUI/EditSheep.java
	it1901g21/src/GUI/SheepInfo.java
Merge branch 'master' of ssh://git@github.com/Gruppe21/exph0001.git

Conflicts:
	it1901g21/src/GUI/EditSheep.java