wito Merge branch 'master' of github.com:wito/Cataclysm-RSR

Latest commit 39995f6

Feb 1, 2016