Initial import of SubjectsPlus 2.0
Merge branch 'master' of https://github.com/davidgonzalez036/subjectsplus