beginning to add fluid and boundary grid
fixed conflict
walls
fixed conflict and added boundary