sockets
removed and added gitignore
emit click
finishing merge master with server