actually deleted .gitmodules?
Merge branch 'work'