Signed-off-by: skullacy <skullacy@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	stufinder/bin/classes.dex
	stufinder/bin/classes/com/example/stufinder/R$layout.class
	stufinder/bin/classes/com/example/stufinder/R$menu.class
	stufinder/bin/classes/com/example/stufinder/R$string.class
	stufinder/bin/classes/com/example/stufinder/R$style.class
	stufinder/bin/classes/com/example/stufinder/R$styleable.class
	stufinder/bin/classes/com/example/stufinder/reg.class
	stufinder/bin/dexedLibs/android-support-v4-ae948886296bf22e25011543e1bd14dd.jar
	stufinder/bin/dexedLibs/google-play-services-9a153f533f4c39544864438f39d46597.jar
	stufinder/bin/dexedLibs/google-play-services_lib-1ad72ba7cca28c14966f33a65cefa362.jar
	stufinder/bin/resources.ap_
	stufinder/bin/stufinder.apk
	stufinder/src/com/example/stufinder/reg.java


Signed-off-by: skullacy <skullacy@gmail.com>