"Index Page Up To Date"
Merge branch 'master' of github.com:stuycs-softdev/proj1-6

Conflicts:
	CCLL/FrontEnd/index.html