insert
Merge branch 'master' of https://github.com/mikevandenkerkhof/webAndDatabaseFinalAssigment

Conflicts:
	js/script.js