Made draft.txt into a cheese diary.
Merge branch 'newfeature'

Conflicts:
	draft.txt