everything but diffs of branch
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