document fixes
Merge branch 'master' of https://github.com/icpcpp/edward
Merge branch 'master' of https://github.com/icpcpp/edward

Conflicts:
	simlogic/Document.cpp