more
e
Merge branch 'master' of https://github.com/hongzuL/cmput333as1

Conflicts:
	.readtext_s.c.swp