stream working, minus styling
Merge branch 'master' of https://github.com/mthjones/seng513

Conflicts:
	config/config.js
Need to pull
Merge branch 'master' of https://github.com/mthjones/seng513