Update README.md
Merge branch 'master' of https://github.com/gjhiggin/course-info into gjhiggin-master

Conflicts:
	assignments/README.md
Merge branch 'gjhiggin-master'