Finished detail?
Merge branch 'master' of https://github.com/ruttennicky/deskhop

Conflicts:
	css/style.css