merge + vfx stuff + placeable stuff
uh
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git