sender
	deleted:    JDFS/bin/TEST/SettingsReaderTest.conf
	deleted:    JDFS/src/TEST/SettingsReaderTest.conf
	modified:   JDFS/src/com/subject17/jdfs/client/net/sender/FileSender.java
	deleted:    JDFS/test.txt
Merge branch 'master' of https://github.com/JamesH-17/jdfs

Conflicts:
	JDFS/bin/com/subject17/jdfs/client/net/sender/Talker.class
	JDFS/test.txt

	modified:   JDFS/bin/com/subject17/jdfs/client/net/reciever/FileReciever.class
	modified:   JDFS/bin/com/subject17/jdfs/client/net/reciever/ListenConnectionHandler.class
	modified:   JDFS/bin/com/subject17/jdfs/client/net/reciever/Listener.class
	modified:   JDFS/bin/com/subject17/jdfs/client/net/sender/Talker.class
	modified:   JDFS/bin/com/subject17/jdfs/client/settings/writer/PeerSettingsWriter.class
	new file:   JDFS/bin/com/subject17/jdfs/test/client/settings/reader/minitest.class
	modified:   JDFS/settings.conf
	modified:   JDFS/src/com/subject17/jdfs/client/net/reciever/FileReciever.java
	modified:   JDFS/src/com/subject17/jdfs/client/net/reciever/ListenConnectionHandler.java
	modified:   JDFS/src/com/subject17/jdfs/client/net/reciever/Listener.java
	modified:   JDFS/src/com/subject17/jdfs/client/net/sender/Talker.java
	modified:   JDFS/src/com/subject17/jdfs/client/settings/writer/PeerSettingsWriter.java
	new file:   JDFS/src/com/subject17/jdfs/test/client/settings/reader/minitest.java
	new file:   JDFS/test.txt
	new file:   JDFS/test2.txt