Reoved all asdcouch files.
Fixed a merge conflict between gh-pages branch and master.
Gh-pages merge error while pulling from origin master.
Attempting to resolve merge conflict issue.