2-27-2014 1008

thursday morning
died
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/Assets/Scripts/ShadowScript2.cs
	TrickyNinja/TrickyNinja/ProjectSettings/InputManager.asset
Merge pull request #11 from DevenSmith/master

try this again