initial commit
Merge https://github.com/ethanclevenger91/AndroidAssignmentOne