A new file named jetang.txt
Dying embers
Eagerly wished
Added some gibberish 'fuzzy wuzzy.'
Merge pull request #6 from untitledc/master

A new file with gibberish
good day
Merge pull request #5 from aatheus/master

Added a new file files/newfile.txt
 add a poem
Merge pull request #7 from jetang/master

another new file
Merge branch 'master' of https://github.com/githubstudent/poetry

Conflicts:
	raven.txt
Merge pull request #8 from jeffhuangtw/master

pull request