3-21-2014 1041
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs
3-21-2014 1507
3-21-2014
premergesteve
fixGithubissues

Conflicts:
	TrickyNinja/Assets/Scenes/DevenScene.unity
	TrickyNinja/Assets/Scripts/CameraFollow.cs
	TrickyNinja/Assets/Scripts/PlayerScriptDeven.cs
	TrickyNinja/Assets/Scripts/ShadowScript2.cs
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #4 from DevenSmith/master

bySteven