Added Entity class
Merge branch 'master' of https://github.com/tomansill/aesthetic