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

Conflicts:
.DS_Store
css/style.css
Merge branch 'master' of https://github.com/ruttennicky/deskhop

Conflicts:
	detailpagina.html