Merge branch 'thomas'
filterz
Icon styling
Merge remote-tracking branch 'origin/louis'

Conflicts:
	app/index.html
ik heb geen idee
pyramid of doom
Fix messed up index.html
App styling