attempt to change main to write to multiple output
Merge branch 'master' of github.com:mkawalec/pumas

Conflicts:
	src/solver.cpp