Encounter v1.0
Merge branch 'SpaceTraderFX' of https://github.com/dbarbet/team23 into SpaceTraderFX