Document
Merge branch 'master' of github.com:icpcpp/edward

Conflicts:
	simlogic/Document.cpp
Merge branch 'master' of github.com:icpcpp/edward