Added tags & simple css

Please review changed files below - Javier - I was unable to merge the changes
you made before you left for some reason.
Merge branch 'master' into simple_css

fixed

Conflicts:
	app/views/answer_finished.erb
Merge pull request #7 from ibarroladt/simple_css

Added tags & simple css