#5 added Entity and tests
Merge branch 'megan' of github.com:team-ord/project-apollo into production