kill me
resolve merge conflicts
Merge pull request #19 from Shiggiddie/get_shit_set_for_distribution

kill me