sync
Merge branch 'master' of https://github.com/correnm/cs595-f13

Conflicts:
	Homework Submissions/Thumbs.db