merge conflict
add database yml example
database yml file
canvas setup"
"
background picture
test admin
add row class
groups show department
background picture
update fixed
tests
group mailer
clean update and destroy action
mailing the group works