reset
new set
alles weg
dennis zijn branches gemerged
Merge branch 'master' into dennis

Conflicts:
	js/config.js