this stuff is working just need files... bitch!
mergeconflicts again
removed invalid music and added death animation
mergeconflict on bounds