Edited to assign entity IDs
Merge branch 'master' of https://github.com/boyshawn/CS4221