Update server code to load binary data from disk.
Merge branch 'master' into load_custom_files

Conflicts:
	server.py
Merge pull request #2 from vvandonselaar-aa/load_custom_files

Update server code to load binary data from disk.