hi
Merge branch 'mike' of https://github.com/cyntzhou/final into mike
hi
Merge branch 'mike' of github.com:cyntzhou/final into mike
Merge branch 'mike' into cynthia

Conflicts:
	text.txt