stream almost done
Merge branch 'master' of https://github.com/mthjones/seng513

Conflicts:
	config/config.js
trying to resolve conflicts