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
Quiz!
Merge pull request #47 from anniezhn/azhang

Quiz!
Font colors for quiz

Changed the .css for the themes so it does not affect the quiz.
Merge pull request #48 from anniezhn/azhang

Font colors for quiz
Seeing it the quiz/font/theme thing works
Merge pull request #49 from anniezhn/azhang

Seeing it the quiz/font/theme thing works
Link quiz back to Basics 1
Merge pull request #50 from anniezhn/azhang

Link quiz back to Basics 1
loginCheck.js change

Setting the Ajax call to be synchronous so the page doesn't load before
the check is made.
Quiz font color
Merge pull request #51 from anniezhn/azhang

Quiz font color
Merge remote-tracking branch 'origin/master' into tnichols