Added color scheme
Merge remote-tracking branch 'origin/master'

Conflicts:
	treat-yo-self/res/values/colors.xml
Added color scheme
Added color scheme
Merge remote-tracking branch 'origin/master'
Added color scheme