Commit to resolve merge conflicts prior to pull
Resolved Merge conflict. Added additional assignmed HTML pages. I also included the jQuery cdn
in the header file. I restructured the project slightly by placing css and images into an assets folder.