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

Conflicts:
	app/views/layout.jade
	lib/controllers/getter.js
	lib/controllers/routes.js
	public/index.html
	public/layout.html
	public/login.html
	public/player.html
	public/playlists.html
	public/signup.html