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

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

Conflicts:
	app/controllers/userController.py
	app/database/test.db
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/controllers/sessionController.py
	app/controllers/userController.py