onshoot listener
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/dudes/android/blocks/MainActivity.java