Buttons now have icons and a half-decent layout.
Merge branch 'master' of https://github.com/phoenix-frozen/uh-oh-android