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