more comments stuff, nearly working
Merge branch 'master' of https://github.com/mcaples/clubhouse