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

Conflicts:
	FriendlySheep/AndroidManifest.xml
	FriendlySheep/res/layout/activity_game.xml
	FriendlySheep/src/com/friendlysheep/ActivityGame.java
Yo
Yoo
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git
Drawn
OnDrawn
Yo