Update cmua-students.txt
sh
tr
shirley
Merge branch 'master' of https://github.com/CMU-Australia-Git-Workshop/Workshop2
Merge branch 'master' of https://github.com/CMU-Australia-Git-Workshop/Workshop2

Conflicts:
	cmua-students.txt
shirley