working controller
Merging with Steven
Merge branch 'features/RH/SW-template' of github.com:ucberkeley/moocchat into features/RH/SW-template