first commit
Merge https://github.com/stevenJohnson/AndroidAssignmentOne