player, routes and controller updated

Don't mess with my scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pages/index.html.erb
	app/views/pages/player.html.erb