Merged color files
Merge branch 'master' of https://github.com/se-bastiaan/MarieDroid

Conflicts:
	marietje/out.map