Added gibberish for testing.
Resolving conflict
Fixing my conflict resolve
Merge pull request #18 from katsamson/master

Resolving a Conflict, Fixing Resolve