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

Conflicts:
	db/schema.rb
Merge pull request #72 from Team-Delta/issue-70

closes #70