Fixing buttons
Fixing buttons, adding another activity
Fixing buttons and filling out the skeleton
Merge branch 'master' of https://github.com/ksunden/22