5/16 begin.
Merge branch 'master' of github.com:CHometeach/hw2

Conflicts:
	a.out
	member.txt