Merge pull request #61 from anniezhn/master

Catch up
insert quiz1 into db
Merge pull request #62 from anniezhn/azhang

Azhang