fixes #222, fixes #223
rubocop fix
rubocop fix 2
This is just a complexity test
Hopeful final pass
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into task-1502
Hopeful final pass 2
Join request done
Deleted edit_curricula controller to remove duplication issue in settings controller
Rubocop mod
Merge pull request #230 from Team-Delta/task-1502

Task 1502
Merge branch 'develop' of https://github.com/Team-Delta/GitMyCurriculum into upload-fix