Merge pull request #6 from DevenSmith/master

Steven Sucks
InputManager
InputAgain

Input Manager Thing
Merge branch 'master' of https://github.com/ScrambledEgge101/TrickyNinja
final of day
Final Week 02-21-2014

Week end project
Merge remote-tracking branch 'upstream/master'
Wednesday 02-26-2014 Beginning of Week

The burrower is now fully functional. The burrower script is complete
and has lots of comments to explain everything that is going on inside
the script. Fixed a problem with the "Jason" branch where it wanted to
combine the master branch with the "Jason" branch by creating "Jason2"
branch.
Merge pull request #7 from ScrambledEgge101/Jason2

Wednesday 02-26-2014 Beginning of Week
Thursday 02-27-2014 10_01am

Morning of Thursday the 27th.
Merge pull request #8 from ScrambledEgge101/Jason2

Thursday 02-27-2014 10_01am
Merge remote-tracking branch 'upstream/master'
hi
Merge pull request #9 from wintergolem/master

Final of project
died
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/Assets/Scripts/ShadowScript2.cs
	TrickyNinja/TrickyNinja/ProjectSettings/InputManager.asset