Deleted unwanted file, Changed location of frontPage.html
Merge remote-tracking branch 'upstream/master'