changed resource into Enumeration
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader