Merge branch 'master' of https://github.com/bartolkaruza/capo
testing with colors
Merge branch 'master' of https://github.com/bartolkaruza/capo

Conflicts:
	LightSpace/app/src/main/AndroidManifest.xml