foo
Merge branch 'master' of https://github.com/Infogroep/HallwayScreen

Conflicts:
	content/random.html