Worked on entities
Merge branch 'master' of https://github.com/Antag99/aquarria