some changes
Merge branch 'master' of github.com:BLNorris/project-rails into superimportantbugfix
refactored code: changed the name of \'schedule\' to \'grade\'.
Merge branch 'master' of github.com:BLNorris/project-rails into superimportantbugfix