Consolidated scratches
Consolidated more scratches
Consolidated scratches
Better model for cross-section in the high-energy spectrum
More scratching
Minor changes to makefile
Backup before system restore
Backup before system restore
Resolved merge conflicts
Merge branch 'master' into better-branch