removed merge artifact.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge pull request #69 from FellowTraveler/master

removed merge artifact.