Merge https://github.com/YOLOcs361/Project

Conflicts:
	course_page.html
Merge https://github.com/YOLOcs361/Project
updated courses page to look nicer..
Merge https://github.com/YOLOcs361/Project