Tmp
Merge remote-tracking branch 'origin/add-play-based-on-artist'

Conflicts:
	assets/javascripts/views/questions.coffee
Tmp
Changed copy