niets aangepast
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/__init__.pyc
	app/controllers/__init__.pyc
	app/controllers/sessionController.py
	app/controllers/userController.pyc
	app/models/__init__.pyc
	app/models/user.pyc
bleble
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/controllers/userController.py