Seting up trap and Potion Collision
Merge branch 'master' of https://github.com/Alke-Games/Dauphine