merge server
gitignore
 images removed