Commented out failing test
Resolved merge conflicts
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
DA-26: Created the cancel button