closes #158
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into task-1119
Merge pull request #168 from Team-Delta/task-1119

closes #158
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into issue-169