moved into 'entities' folder
Merge branch 'master' of github.com:cgibson/RGJ_2014