demo merge conflict
Merge branch 'master' of https://github.com/eddiew/grademe

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