kappi rulez
Merge branch 'ndev' of https://github.com/noahfradin/CourseCub into ndev

Conflicts:
	.DS_Store
kappi rulez even more