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

Conflicts:
	simlogic/Map2.hpp
Map compiles
Merge branch 'master' of https://github.com/icpcpp/edward
Merge branch 'master' of github.com:icpcpp/edward