trying to get this to work
Merge branch 'master' of https://github.com/schifano/android-grader