'asd'
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop
Merge branch 'master' of https://github.com/icedtrees/unsw-git-workshop
Merge remote-tracking branch 'origin/master'
added albert as an attendee
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