Huh?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
April 3, 2014 end of day

I give up.
I give up

Conflicts:
	TrickyNinja/Assets/Prefabs/AnimationRig_V3.prefab
	TrickyNinja/Assets/Scripts/MonkScript.cs
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #20 from ScrambledEgge101/master

I give up