carmen -Line 7
branching meow
Fixed merge conflict
merging conflicts
Adding another sentence
Merge pull request #6 from angiegove/Meow

branching meow
fixed errors again
Updating
Merge pull request #7 from angiegove/Jess

Adding another sentence
carmen is cool
added line something
Merge pull request #4 from angiegove/catareawesome

Catareawesome
added more 'hahahas'