a space or two I think
git insisted
Merge branch 'master' of github.com:BathUniApp/bath-uni-app

Conflicts:
	res/layout/settings_view.xml
Merge branch 'master' of github.com:BathUniApp/bath-uni-app