buttons r gud
Merge branch 'master' of https://github.com/fabiopk/android_project.git
buttons r gud again