addSheep, add farmer
Merge branch 'master' of
ssh://git@github.com/Gruppe21/Prosjekt-it1901.git

Conflicts:
	it1901g21/src/it1901g21/Main.java