working on resource loading page
changes in gitignore
conflict resolved