url stuff
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project
list stuff
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project

Conflicts:
	DisSoNet/DisSoNet/urls.py
	DisSoNet/front/views/stream.py