Cleaning up controllers
Merge branch 'master' of github.com:aarononken/YMCA