Enemy moves to player

Not working yet
Fixed merge conflicts
Fixed Merge conflicts
Merge branch 'master' of https://github.com/macilath/Star-Command-Division-6

Conflicts:
	Assets/Scripts/EnemyController.cs