commit fix
fix
fix
git merge alvin
commit merge
libs fix
Merge branch 'Alvin'

Conflicts:
	index.html
	ranking.html
ranking fix
poging tot requirejs met router
routing toegevoegd
pagina overgang
Merge branch 'dennis'

Conflicts:
	css/screen.css
	css/style.css
	index.html
	js/app/models/match.js
	js/app/views/poolView.js
reset
new set
alles weg
fix