safety
Merge branch 'master' of https://github.com/penghaoruo/WSD

Conflicts:
	report/CS446projCheckIn.pdf
safety