added a test enemy with simple logic
getting a ton of errors
Merge branch 'master' into mystuff

Conflicts:
	Assets/Scripts/ThirdPersonPlayer.cs