ResourceManager updated
123
Merge branch 'resource_manager' of https://github.com/aivel/RPG
working hooray