giang screenshot
Merge branch 'master' of https://github.com/sarahbearmh/cscd350

Conflicts:
	Thumbs.db