Almost final
Merge branch 'master' of https://github.com/WebTechGroup5/Project