modified:   main.c
Merge branch 'master' of https://github.com/yishanhe/ZKP

Conflicts:
	main.c
	modified:   main.c
	modified:   message.dat