* moved some things
* moved some more things
* enemies first commit
Merge branch 'develop' into feature/enemies

Conflicts:
	unity/Assets/Scripts.meta
* add enemy in scene
* stop tracking some files