connor eggleston personal project
Merge branch 'master' of https://github.com/connor-asu/course-info into connor-asu-master

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