History and now playing; improved style
Merge branch 'zuzak'

Conflicts:
	routes/player.js
	static/style.css
	views/queue.jade
add basic css for fs
Refactor Player and add tests
Merge branch 'master' of git://github.com/danharibo/cinequeue

Conflicts:
	views/queue.jade
escape URI