inital commit comment
Merge https://github.com/adamtw1/AndroidAssignmentOne