conflict test: modify a file on develop branch
conflict test, made on feature branch
Merge branch 'feature_preference' into develop

Conflicts:
	src/mackwell/nlight/LoadingScreenActivity.java

	added change from both