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

Conflicts:
	index.php