Initial Commit
Merge http://github.com/Shivam101/Proximity-Android
Initial Commit
Conflicts:
	LICENSE
	README.md