Added firstPage.html
Made a change on work1
Made change on master
Merge Conflict
More master changes