Initial Commit
Merge http://github.com/Shivam101/ProximityApp
Initial Commit
Conflicts:
	README.md