angrymode & punch
Merge branch 'master' of https://github.com/Xazen/BerlinMiniGameJam-Dec

Conflicts:
	BerlinMiniGameJam-Dec/Assembly-CSharp-vs.csproj
	BerlinMiniGameJam-Dec/Assembly-CSharp.csproj
	BerlinMiniGameJam-Dec/Assets/Scripts/WolfMove.cs.meta
	BerlinMiniGameJam-Dec/BerlinMiniGameJam-Dec-csharp.sln
	BerlinMiniGameJam-Dec/BerlinMiniGameJam-Dec.sln