fixes merge shit
Merge pull request #12 from quackhouse/fixing_merge_shit

fixes merge shit