adds stop
Merge branch 'master' of https://github.com/AaronPlave/Senuti

Conflicts:
	Senuti/bin/classes/com/example/senuti/MainActivity$1.class
	Senuti/bin/classes/com/example/senuti/MainActivity.class
	Senuti/src/com/example/senuti/MainActivity.java