i1
Merge branch 'icons' of github.com:d3orn/hikomsys into icons

Conflicts:
	website/css/style.css