Merge pull request #5 from lowkey42/feature/assetManager

Feature/asset manager
my hands are typing words
Merge pull request #6 from lowkey42/dev

Dev