Merge pull request #61 from anniezhn/master

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

Azhang
Touching Up
test
Merge pull request #64 from anniezhn/azhang

Azhang
(Joyce): tweaked some stuff in both lessons
Inserted conditional example into the master doc
Code for conditionals example 1
Cleaned up conditionals.html