check

check
Merge branch 'master' of https://github.com/nguyenshane/CreativeColors

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