removed merge conflict junk
Merge pull request #7 from thefringeninja/merge-fix

removed merge conflict junk