adf
Merge branch 'master' of https://github.com/robbertstevens/raak-sportspelen-www

Conflicts:
	js/index.js
Merge branch 'master' of https://github.com/robbertstevens/raak-sportspelen-www