Added my CouchDB folder

Added my CouchDB folder
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'

Conflicts:
	.DS_Store
	asdproject/app/_attachments/index.html