"here is a file!"
A little cowsay + figlet
playin'
Merge branch 'master' of https://github.com/soycamo/gitx into soycamo-master
this merge is EXTREMELY necessary.  there's a little figgy cow!!
Update README.md
Merge branch 'soycamo-master'
I think all's well?
trying to ummm resolve a merge conflict
it's starry
Merge branch 'master' of https://github.com/rachelkelly/gitx into upstream

Conflicts:
	README.md
I think this will help us complete our project sooner
Merge pull request #7 from rachelkelly/racheltest

Racheltest
merge conflict resolution
added waves