Commit to master branch adds files from Charlie's branch + new html directory. Deletes Test.html