Resizing and volume control together
Merge conflict resolution
Merge branch 'redesign' of https://github.com/mcb80x/minimal-player into redesign

Conflicts:
	templates/player.jade
Merge pull request #118 from thompsona/redesign

Volume merge with comment input