smaller field for testing on cluster
Merge branch 'master' of https://github.com/Arnatar/ideas-papo2014

Conflicts:
	mpi-try/constants.h