partial violate.sql
Merge branch 'master' of https://github.com/yuxilin/CS143PROJ1B

Conflicts:
	violate.sql