Remove redundant file.
Merge branch 'master' of github.com:peterlindkvist/allplay
Merge branch 'master' of github.com:peterlindkvist/allplay
Merge branch 'master' of github.com:peterlindkvist/allplay
Add SoundCloud player. BOOM!
Merge branch 'master' of github.com:peterlindkvist/allplay

Conflicts:
	app/assets/javascripts/PlayerFactory.js