add torch files
Merge branch 'master' into joy
add sound to level 2
Merge branch 'master' into joy
tweak collisions