fixing merge conflicts
fixing merge conflicts
Merge branch 'master' of github.com:ucberkeley/moocchat