Fixed diff bugs; edited run script
Server saves sometimes
Merge branch 'master' of https://github.com/jackmacattack/Fred.git

Conflicts:
	client.pyc
	gui.pyc
	server.pyc
	user_input.pyc
Deleted bad .pyc files
Merge branch 'master' of https://github.com/jackmacattack/Fred.git