not a commit
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
added index
added index
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop