Fixed messiness with resources, FINALLY
Merge branch 'master' of github.com:inf1op/unimon