Added more classes for jbravo
Merge branch 'master' of https://github.com/jackrk/4yearplanner