buttons
update buttonow
comit
Merge branch 'master' of
ssh://git@github.com/Usernamealreadynottaken/Octopus.git

Conflicts:
	Octopus/bin/Octopus.apk
	Octopus/bin/classes.dex
	Octopus/bin/resources.ap_