minor changes
Merge branch 'master' of https://github.com/chriscx/Disko

Conflicts:
	app/views/layout.jade
	app/views/player.jade
	lib/controllers/getter.js
	lib/models/track.js