second commit
Initial files
Merge https://github.com/amandahandler/CS314Android