Okay, so we'll use doublespacing.
Restyle after the boat PR.
Merge pull request #8192 from Rivet-the-Zombie/fix-singlespaces

Fixes spacing.
Restore compatibility with gcc 4.6 by removing a delegated constructor.
Changed the use of std::stoi to std::istreamstring in unfold_generic to allow compiling with CodeBlocks.
fix mannwurst recipe category
Merge pull request #8196 from WillyGalleta/recipe-fix

fix mannwurst recipe category
Merge branch 'gcc-4.7-compat' of https://github.com/kevingranade/Cataclysm-DDA into merge
Merge branch 'compatibility-fix' of https://github.com/WillyGalleta/Cataclysm-DDA into merge