Did major work on traps.
Merge branch 'master' of https://github.com/Saucymeatman/turbofingerswipe.git