Changed colours, added html stuff
Merge branch 'master' of https://github.com/davidcornu/guess-who

Conflicts:
	app/views/stories/random.html.erb
	app/views/stories/show.html.erb