Merge branch 'master' of https://github.com/ccoddes/NoRefusal

Conflicts:
	app/src/main/res/layout/description.xml
	app/src/main/res/layout/end.xml
	app/src/main/res/layout/extent.xml
	app/src/main/res/layout/main.xml

Revert "lala"

This reverts commit
6c278f07991308d748545430aad87e0a5f6cf91f.

lala