# WARNING: head commit changed in the meantime

Merge branch 'master' of https://github.com/firebears-2014/sandbox0.git

Conflicts:
	french_bread.md
Merge branch 'master' of https://github.com/firebears-2014/sandbox0.git
merge