Merge pull request #13 from DevenSmith/master

3-28-2014 1132
Started preparing sword guy for animation

Sword Guy raycasts forward and is ready to animate.
TryAgain
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scripts/EnemyScript.cs
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #15 from ScrambledEgge101/master

Try Again
aksdj;
Waiting for Deven
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
3-28-2014 1722
shadowlayerweapon
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs