added cookies
removed gitmodules
fix
Finalizing merge