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