kappis first solo commit
Merge branch 'noah' of https://github.com/noahfradin/CourseCub into noah

Conflicts:
	.DS_Store