Test
Merge https://github.com/MichaelLeith/Android-Wireless
Test
Conflicts:
	.gitignore
	LICENSE
	README.md