i am adding a second file
Merge branch 'master' of github.com:fredmcgroarty/water

 Please enter a commit message to explain why this merge i
t
quit
:Q
:W# Lines starting with '#' will be ignored, and an empty message aborts