Updated DH
Merge branch 'master' into dev

* master:
  Refactored server code to classes.
  added dh_param checks.
  Cleaned up client code into classes.

Conflicts:
	server.py
Updated server AES