Paint: Gun 1&2, Ice 1
Merge branch 'gabe'