Shelly FTW
Merge branch 'master' of https://github.com/githubstudent/poetry

Conflicts:
	ozymandias.txt
Merge branch 'master' of github.com:githubteacher/poetry
Merge branch 'master' of github.com:githubteacher/poetry