merge
Merge branch 'master' of https://github.com/petitJAM/SchedulePlanner
Merge branch 'master' of https://github.com/petitJAM/SchedulePlanner
merge