colors
Merge branch 'master' of github.com:blchang/splist

Conflicts:
	res/layout/list.xml