hello
Merge branch 'master' of https://github.com/pmiller2/doubleds

Conflicts:
	src/main/java/com/app/doubleds/Activity/MainActivity.java