Commited
Merge branch 'master' of github.com:xwak/issss

Conflicts:
	public/css.css
	views/mark_answers.erb
	views/question.erb