add player
add sm
working
Merge branch 'polling_with_player'

Conflicts:
	app/views/radio/index.html.erb