merging
merge
Merge branch 'master' of https://github.com/cnhe/grouploops
reorganized pages
added survey and welcome pages