new poet!
adding frost
awesome github
Shelly FTW
the world is a beautiful place
SHelly conflict
updating readme
Liked poem
Merge pull request #12 from regischarton/master

Adding the Class is awesome
Merge pull request #21 from ygez/master

Liked your poem
Merge pull request #1 from jjbudz/master

Future poet list incomplete
adding some frosty
Merge pull request #2 from iennae/master

Frost is cool
Merge branch 'master' of https://github.com/githubstudent/poetry

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