Diff Command
merge conflict
Added Diff and Pull functionality, Pull is still iffy
testing some stuff
Merge branch 'master' of https://github.com/spardue/computer-networking-project-4
Merge branch 'master' of https://github.com/spardue/computer-networking-project-4

Conflicts:
	src/clientlogic/ClientLogic.java
Merge conflict