first commit
angularJs color game
minor change
Merge branch 'gh-pages'

fixed Conflicts:
	app/css/app.css
	app/img/twitter.PNG
	app/index.html
test