just pulling thomas's error checking
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
error checking properly working
error checking & tests working