Fixed conflicts

Conflicts:
	app/src/main/java/com/bearnecessities/colorzeh/LockScreen.java