Added level set data structure and initialization, switched to WaterMACGrid
Fixed merge conflict because Michael beat me to the push