first attempt at integrate gui with client.py, update user_input.py to run gui
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