Not entirely sure why I have to commit.
Merge branch 'master' of https://github.com/amandahandler/CS314Android
Merged and fixed a few small typos