fadf
Merge branch 'master' of https://github.com/a161527/GGJ14Chickens

Conflicts:
	Chickens/Assets/Scripts/Weapon/egg.cs