everything is here and working except for edit/delete.
Merge branch 'master' into gh-pages
Updated file.

Week 2 file still needs edit and delete.
asdcouch is my couchdb app that is uploaded to Cloudant.com.