Merge pull request #1 from Herzucco/Greg

Greg
commit before merge
Merge remote-tracking branch 'origin/Greg'

Conflicts:
	Dev/Assets/Scenes/ennemy.unity
Merge branch 'master' of https://github.com/Herzucco/chromosomes into Greg