Merge pull request #20 from AzureusNation/master

Entity is nearly finished
Entity is finished apart from other class Objects