Add family and type to channel
Merge branch 'master' of github.com:Evangenieur/TeamHome
Add userlist draft