fixes #198, #199
fixes
merge fixes
DA FIX
Merge pull request #204 from Team-Delta/task-1508

fixes #198, #199
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into merge-beginnings
closes #192, closes #211, cleanup