some controller change
Merge branch 'setup-testing' of github.com:andrewhl/AdvancedStudyRoom into setup-testing
more controller stuff
Merge branch 'setup-testing' of github.com:andrewhl/AdvancedStudyRoom into setup-testing
Merge branch 'setup-testing' of github.com:andrewhl/AdvancedStudyRoom into setup-testing
cleaning up spec support files