Merge pull request #2 from atironati/master

blah
Merge pull request #3 from atironati/master

boom
sync clocks

untested
search for "!!!" to find the offset I  added, not sure if I am doing it
legally
Merge branch 'master' of git://github.com/haynesma/network-security into haynesma-master

Conflicts:
	Final-Project_SecureIM/client.py
	Final-Project_SecureIM/server.py