changes
Merge branch 'AaronBranch'

Conflicts:
	sph2amr_al.c