changes
pulling Thomas's code
pulling thomas's monday morning push
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
pulling new update
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
pulling thomas's stuff
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
seperated error methods