Create hey.txt
Update hey.txt
kittens
Create kittens.txt
Update hey.txt
me too
Merge pull request #1 from rachelv/master

merge me plz
Merge pull request #2 from axolote/master

add "me too"
Change to 'kitteh'
Merge branch 'master' of https://github.com/tccharles/gdi-boulder-1

Conflicts:
	README.md
Merge pull request #3 from mbsnyder/master

KITTIES!
Merge pull request #4 from githubstudent/master

Second Stanza