merging report
working on report and touchups
fixed bug with fluid simulation.  Added fluid particle.  More cleanup