update lezingen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	USBwebserver8/apache2/logs/access.log
	USBwebserver8/apache2/logs/error.log
	USBwebserver8/apache2/logs/httpd.pid
	USBwebserver8/mysql/data/ib_logfile0
	USBwebserver8/mysql/data/ibdata1