test
test2
Merge branch 'master' of https://github.com/PierreBeucher/VirtualWorldFinalProject

Conflicts:
	src/model/enemy/EnemyCharacteristic.as
	src/model/environment/Environment.as
	src/view/enemyshipview/EnemySmallShipView.as
	src/view/gameview/GameView.as