Merge pull request #12 from drobbs/master

Resource System Rewrite