forget modifed controller
Merge branch 'master' of https://github.com/elliotanderson13/booksmart1