Merge pull request #2 from teamcoolguys/master

butts-dylancomp