Made some changes to the resources
fixed resource.js merge conflict
fixed some file stuff, still doesn't work