closes #41
fixes #42
Merge branch 'master' of https://github.com/skylarbpayne/component-entity-system into develop
Some testing