domharrington/control — comment on commit a35196f76d242f8ec05e27e215088f7b8d8060f3
File:  line 0
By serby:

Try and avoid having to merge master with a commit. If you stash before you pull it should prevent this. I might be wrong.

Everything else looks good.