lol
Merge branch 'master' of https://github.com/LarryBarge/ThreadEx

Conflicts:
	src/com/example/ThreadEx/MainActivity.java
Merge branch 'master' of https://github.com/LarryBarge/ThreadEx