,
d
Merge branch 'master' of https://github.com/JelleBosmans/PenO_CWA1

Conflicts:
	Versie 1.0/Class_Trophies.pyc
	Versie 1.0/Hulpfuncties.pyc
	Versie 1.0/Register_controller.pyc
	Versie 1.0/SessionManager.pyc
	Versie 1.0/User.pyc
	Versie 1.0/User_manager.pyc
	Versie 1.0/fullDB.pyc
	Versie 1.0/html_handler.py
	Versie 1.0/sessionDB.pyc