no changes
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git

Conflicts:
	FriendlySheep/src/com/friendlysheep/ActivityGame.java
Added score