Changes to the html5 player
Merge branch 'master' of crimsontautology.com:iga

Conflicts:
	app/controllers/songs_controller.rb
	app/views/songs/play_html5.html.erb