likes_question
Merge branch 'master' of https://github.com/dsounded/brain-portal

Conflicts:
	app/views/game/sheet.html.erb