Modifications
Merge branch 'master' of https://github.com/saood1/Hackathon

Conflicts:
	ProximityFileSync/src/com/hackathon/filesync/CommonUtility.java