added collapse behavior
Merge branch 'master' of https://github.com/Z1MM32M4N/marauder
fixed the fucking stacking bug thing)
merge conflicts