encrypt/decrypt up to date. also going to attempt to merge'
Merge branch 'master' of https://github.com/eksoderstrom/EFS

Conflicts:
	client.py
	client_classes.py