add *.out files to gitignore
add c-socket-server examples
resolve merge conflicts