changes in Spy.cpp, Spy.hpp, World.hpp
Merge branch 'master' of https://github.com/icpcpp/edward

Conflicts:
	simlogic/Spy.hpp