Merge pull request #24 from kevinelong/master

week10a
Merge pull request #25 from kevinelong/master

test
Merge pull request #26 from kevinelong/master

demo_site
Merge pull request #4 from PdxCodeGuild/master

merge