comment members table
 conflict fix
groups controller add
Merge branch 'master' into EmilRojewski
adding matches to group