Example again Burnt
Merge branch 'master' of https://github.com/twestura/BasicMerge

Conflicts:
	ShoppingList.txt

Using plain old toast
:wq