deleting from master
moving shelvemod into mlj5tq
removing ui from mlj5tq
added change password, retrive password, remove user, and get info. updated add user
added a change file count method
Changes
Final changes recognition
Corrected some bugs
New admin interface
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	.idea/Fred.iml
	.idea/misc.xml
	.idea/testrunner.xml
	.idea/workspace.xml
Integrated data file and server
Combined interface into user_input
Merge branch 'mcs8sc' of https://github.com/jackmacattack/Fred.git into clientServer

Conflicts:
	client.pyc
	user_input.py