Syincin
Merge branch 'master' of https://github.com/captnjohnny1618/reconstruction

Conflicts:
	mac/parallel_rebin.c