Removing more git diff cruft that wound up in the file.
Merge pull request #10 from biiwide/master

Removing more git diff cruft that wound up in the file.