added nypl_bibliocommons
resolved .gitmodules conflict