closes #154
patch 1
patch 2
patch 3
patch 4
patch 5
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into task-1123
patch 6
Merge pull request #157 from Team-Delta/task-1123

closes #154