Updated the group page and my page
Fixed conflicts
Merge branch 'dilini-mampitiya-master'
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop