Nate Wakes up.
Merge branch 'master' of https://github.com/MikeWyatt/ChickenChaser.git

Conflicts:
	Assets/Plugins/Scripts/Chicken/ThrownBehavior.cs
	Assets/Prefabs/Chicken.prefab
Modifying Player
PUnch
Player Reorganized
Merge branch 'master' of https://github.com/MikeWyatt/ChickenChaser.git

Conflicts:
	Assets/Materials/Material #28.mat
	Assets/Models/Farmer/farmer_Rigged@a cross punch - loop.anim
	Assets/Models/Farmer/farmer_Rigged@carrying someone idle - loop.anim
	Assets/Models/Farmer/farmer_Rigged@lifting a heavy object with both hands - loop.anim
	Assets/Models/Farmer/farmer_Rigged@male knocked down from a punch.anim
	Assets/Models/Farmer/farmer_Rigged@running while carrying someone - loop.anim
	Assets/Models/Farmer/farmer_Rigged@soccer sideline throw in.anim
	Assets/Models/Farmer/farmer_Rigged@standard walk - loop.anim
	Assets/Models/Farmer/farmer_Rigged@standing up from back.anim
	Assets/Models/Farmer/farmer_Rigged@walking while carrying someone - loop.anim
	Assets/Players/Player.prefab
	Assets/Players/PlayerPunch.js
	Assets/Scenes/mainscene.unity
	ChickenChaser.userprefs