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