hello from Jacky 2
Merge branch 'master' of https://github.com/nguyenshane/CreativeColors

Conflicts:
	src/com/nguyenshane/creativecolors/MainActivity.java