Merge pull request #45 from anniezhn/master

Catchup with pushes
Deleted the .png
Merge branch 'azhang' of https://github.com/anniezhn/CSC210 into azhang

Conflicts:
	basics1-quiz.html
Resolve conflict
Merge pull request #46 from anniezhn/azhang

Azhang