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

Conflicts:
	.DS_Store
	index.html