integrated with FB, Parse
added .gitignore to not syncing bin & gen
Merge branch 'master' of https://github.com/nguyenshane/CreativeColors

Conflicts:
	bin/AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/nguyenshane/creativecolors/MainActivity.java