added nginx and mysql as git submodules
fixed merge conflict