heel veel spul
Merge branch 'master' of https://github.com/hkruisselbrink/WebTech

Conflicts:
	WebContent/movie.html
	WebContent/movies.html
	WebContent/user.html
	WebContent/users.html