Endofday3/6ByStevenOnDevens'sProject
Merge pull request #10 from ScrambledEgge101/master

Jason March 6, 2014 @ 2_02pm
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
missed a file
Merge pull request #12 from DevenSmith/master

Merge with jason by SH Onto DS
Merge remote-tracking branch 'upstream/master'