Added trap system
Merge branch 'master'
Added another trap
50 items