Update
Merge branch 'master' of https://github.com/lrpaul01/UofL_Android_Homework

Conflicts:

homework5/GeoQuiz/src/com/bignerdranch/android/geoquiz/QuizActivity.java
Test