Forgot to call main for one method...
finished integrating gui to client.py, jack needs to add functionality to sync on and sync off. and sent user password (all of this is in the comments)
Merge branch 'mcs8sc' of https://github.com/jackmacattack/Fred.git into linux

Conflicts:
	user_input.py
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git into linux

Conflicts:
	.idea/workspace.xml
	client.py
Server saves db now; start of sync
Get file sending
Fixed saving files. end-to-end now works for file sync