changed main for testing (TS)
Merge branch 'master' of https://github.com/TheGang/simulation
tag in exchangePvalues (TS)
Merge branch 'master' of https://github.com/TheGang/simulation

Conflicts:
	src/communication.cpp