vrienden, profiel en fotolocatie
bla
Merge branch 'master' of https://github.com/JelleBosmans/PenO_CWA1

Conflicts:
	Versie 1.0/SessionManager.pyc
	Versie 1.0/html_handler.py
	Versie 1.0/templates/vrienden.html