added group name
changed something
commited something else
fixed merge conflict
changed config file, and added a 'team' page