initial committtt
Merge https://github.com/stevenJohnson/AndroidProjectOne