Added loop on incorrect input
first attempt at integrate gui with client.py, update user_input.py to run gui
Testing code
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	client.py
	user_input.py
updated client.py with pass methods for jackkkkkkkk
More stuff
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	.idea/workspace.xml
	client.py
Integrated Watchdog
Merge branch 'master' of https://github.com/jackmacattack/Fred.git

Conflicts:
	server.pyc
	user_input.py
Merge branch 'clientServer'

Conflicts:
	.idea/workspace.xml
	client.py
	client.pyc
	listener.pyc
	server.pyc
	shelvemod.pyc
	socket_thread.pyc
	user_input.py
	user_input.pyc
Removed bad compilations
Reset for local activity