pulling thomas's changes
modified main buttons
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid