Poem about the typo
Added legal notice about heat
Merge branch 'new_branch'