changement de weapon
Merge branch 'master' of https://github.com/Herzucco/chromosomes into Greg
commit before pull
Merge remote-tracking branch 'origin/Greg'
Lumieres et autres trucs
Bailesque
Merge remote-tracking branch 'origin/Greg'

Conflicts:
	Dev/Assets/Resources/Main Camera.prefab
	Dev/Assets/Scripts/Greg/ShipController.cs
	Dev/Assets/Standard Assets.meta