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