Merge branch 'master' of https://github.com/casherart/WebtechGroup8.git