trash
fuck you git
Merge remote-tracking branch 'origin/master'
fixed shooting and spawning