controller changes
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project

merge