bootstrap.js error fixed
Merge branch 'master' of https://github.com/petitJAM/SchedulePlanner