z
Buttons
Merge branch 'master' of
ssh://git@github.com/Usernamealreadynottaken/Octopus.git

Conflicts:
	Octopus/res/layout/activity_main.xml
	Octopus/src/octopus/menu/MainActivity.java