Change colors
Merge branch 'master' of https://github.com/venci6/ColorzEh

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