find one place
reback
chang one place
maybe all right
Merge branch 'test'

Conflicts:
	2DPotts_parallel.cpp
still have problem