raycaster fix
Merge branch 'master' of https://github.com/emiax/pink-fluid
cleaned up merge conflicts added some comments
fixed conflicts