updat gitignore to igore emacs temp files
Merge branch 'merge-client-server' of github.com:riolowry/cs3780-networks into merge-client-server
fix syntax error