probleem zoeken
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/__init__.pyc
	app/controllers/userController.py
	app/controllers/userController.pyc
	app/database/test.db
login methode verbeterd en getest -> werkt naar behoren
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/__init__.pyc
	app/controllers/__init__.pyc
	app/controllers/userController.pyc
	app/forms/__init__.pyc
	app/forms/loginForm.pyc
	app/models/__init__.pyc
	app/models/user.pyc