a text file to play around with branching
added line to bob while on dev branch
Merge branch 'master' into dev
more notes added to branch while on dev branch
added fluid fix