added chcomousse
Merge branch 'master' of github.com:ritchiejacobs/webtech2-lab1

Fix merge