bug fix
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project
added mixinns for geting user info, as well as getting list of all users
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project

Conflicts:
	DisSoNet/templates/index.html