Stef added his mark
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop
addo says hello
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop

Conflicts:
	template/index.html
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop

Conflicts:
	template/index.html
:
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop

Conflicts:
	template/index.html
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop