new small changes
Merge branch 'master' of github.com:EdoardoCarlesi/analysis

Conflicts:
	src/libhalo/subhalo_properties.c