modified:   Makefile
	modified:   MakefileMAC
	modified:   message.dat
	modified:   .gitignore
	deleted:    message.dat
Merge branch 'master' of https://github.com/yishanhe/ZKP

Conflicts:
	.gitignore