added while loop in main
Merge branch 'master' of https://github.com/vmkf5/CS5600

Conflicts:
	src/client/Peer.java
Merge branch 'master' of https://github.com/vmkf5/CS5600

Conflicts:
	src/client/Peer.java
Merge branch 'master' of https://github.com/vmkf5/CS5600

Conflicts:
	src/client/FileDownloadThread.java
	src/client/Peer.java
	src/data/config.properties
Merge pull request #5 from lmnn3/master

Merge pull request #4 from lmnn3/master