Updates for Ted.
Merge branch 'master' of https://github.com/sfu-innovation/cmpt-474

Conflicts:
	README.md