astyle
Merge branch 'inv' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-inv
Merge pull request #6266 from illi-kun/inv

astyle inventory.cpp
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA