Geen tijd
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/templates/pages/base.html
Grafieken werken
Waarom trackt git niet alle changes in een keer? Nu werken de grafieken zeker -_-
Anders wil hij niet pullen....
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/controllers/userController.py
	app/database/test.db
	app/static/js/dashboard.js
	app/templates/pages/dashboard_profile-info.html
Some changes needed to get it working again after pull
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/controllers/sessionController.py
	app/controllers/userController.py
	app/database/test.db
	app/models/session.py
	app/models/user.py
r