Merge pull request #9 from ScrambledEgge101/master

Another pull request
Enter Jason?
More?
Merge remote-tracking branch 'origin/branch'
3-27-2014 1630
ShadowRenderAndSwapAdjust
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #10 from DevenSmith/master

3-27-2014 1657 You Want a Pull Request Ill Give you A Pull Request
another commit
Merge pull request #11 from DevenSmith/master

another commit
SwapVibration,Deven's Stuff
CameraFix
3-28-2014 1123

can move and attack set up enemy animation rig and player hit marks
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #13 from DevenSmith/master

3-28-2014 1132
TryAgain
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scripts/EnemyScript.cs
	TrickyNinja/TrickyNinja.userprefs