Took uploads out of comments
added verify method
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	.idea/workspace.xml
Changing interface to work with client server
???
Final changes to interface for client.
Merge branch 'mcs8sc' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	client.py
	user_input.py