allocate
trash
undo merge
Merge branch 'fourier'

Conflicts:
	V0.5/DiagMC.f90
	V0.5/fourier.f90