Merge remote-tracking branch 'origin/master' into dennis
config bijgewerkt
Merge branch 'master' into dennis

Conflicts:
	js/config.js
css fix
navigatie
lege commit
Merge branch 'master' into dennis

Conflicts:
	css/screen.css
	index.html
	js/app.js
	js/app/collections/matchesCollection.js
	js/app/views/matchesView.js
	js/config.js
format fix
fix
Merge branch 'master' into dennis
ranking api collection gekoppeld