fixing merge
Merge pull request #10 from dvmonroe/shits_not_working

fixing merge