Player prefab change, Enemy prefab change
Merge branch 'master' of https://github.com/apautrot/gdp7

Conflicts:
	Assets/Enemy/Enemy.prefab
	Assets/Level 1/Level 1.unity
	Assets/Player/Player.prefab
Merge branch 'master' of https://github.com/apautrot/gdp7