Changed upload logic

If peer stops sharing in middle of upload, he will no longer get upload benefit.
Fixed sorting issue caused by concurrency and JDK7
Merge branch 'best-of-both-worlds' of https://github.com/PritomAhmed/bittorrentsim-java into best-of-both-worlds

Conflicts:
	.idea/workspace.xml
	out/production/BittorrentSim/Main.class
	out/production/BittorrentSim/Peer.class
	out/production/BittorrentSim/SharedFile.class
	out/production/BittorrentSim/Tracker.class
	result.csv
	resultWithHonourRequest.csv
	src/Peer.java
Experiment carried out