hallo
Merge branch 'master' of https://github.com/marcojansen/WebTechProject2

Conflicts:
	javascript/script.js