Merge pull request #8 from bmschmidt/dev

Fixing Quotation Marks
Merge branch 'dev'
commenting out removal of 'catalog'--good idea?
Merge branch 'dev'
Merge branch 'master' of github.com:bmschmidt/BookwormAPI
New method for joint words queries + Minor bugfix
Fully supports the GUI with modern calls: preliminary test
Merge pull request #10 from bmschmidt/master

Master into dev merge