merge

history search toegevoegd
Merge branch 'master' of https://github.com/Projectgroep-18/Beveiligde-Pasjes

Conflicts:
	Gui.py
Merge branch 'master' of https://github.com/Projectgroep-18/Beveiligde-Pasjes

Conflicts:
	UseDatabase.py
Merge branch 'master' of https://github.com/Projectgroep-18/Beveiligde-Pasjes