update ignores, button ids
Merge branch 'master' of https://github.com/nguyenshane/CreativeColors

Conflicts:
	gen/com/nguyenshane/creativecolors/R.java