installing draper
Merge branch 'master' of github.com:blairand/gschoolroster
fixing the decorator and a merge conflict