Coloring
merge
androidmanifest added