Commit for an overwrite via pull
Further commits for a merge
More attempts to commit before pulling
Committing before merge
Let's try again
Added viscosity and wall repulsion, untested