Merge branch 'magic'

Conflicts:
poem.txt