Merge branch 'master' of https://github.com/elbzero/GroupPraise

Conflicts:
Working HTML files/Eric/titlePage.html
test
test