changes
Merge branch 'master' of https://github.com/jitendes/peer-2-peer-file-sharing-system

Conflicts:
	install.rtf