finish test gen fakery for presentation
Merge branch 'master' of https://github.com/eddiew/GradeMe into testgen

Conflicts:
	app/src/main/java/net/eddiew/grademe/MainActivity.java