final of day
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from ScrambledEgge101/Jason2

Wednesday 02-26-2014 Beginning of Week
Merge pull request #8 from ScrambledEgge101/Jason2

Thursday 02-27-2014 10_01am
Merge remote-tracking branch 'upstream/master'
hi
2-27-2014 1008

thursday morning
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
Merge pull request #11 from DevenSmith/master

try this again
Merge pull request #12 from ScrambledEgge101/master

February 28, 2014 @ 2_24pm