fixes #198, #199
fixes
refactoring
Merge pull request #210 from Team-Delta/cleanup

refactoring
merge fixes
DA FIX
everything but diffs of branch
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
Merge pull request #212 from Team-Delta/merge-beginnings

Merge beginnings
closes #218 #219 #217 #216 #215 #214 #213 #206
patch 1
Merge pull request #220 from Team-Delta/task-1504

closes #218 #219 #217 #216 #215 #214 #213 #206
closes #195 and  #196
patch 1
Merge pull request #221 from Team-Delta/task-1101

Task 1101
Fixes issue-225