Jordan was here change
Added file
new brent file
Merge pull request #3 from brntbeer/master

new brent file
Tidying up loose ends
Merge pull request #11 from manjushamaddala/master

Added file
Merge pull request #4 from githubstudent/master

Put my name in the poem file
Merge branch 'master' of git://github.com/githubtrainer/walrus

Conflicts:
	main4.txt
	main5.txt