DA-60: Began implementation. Cannot progress until the main screen has been created.
Merge branch 'master' of https://github.com/riis/ProgrammingChallengeAndroid
DA-60: Resolved merge conflicts.