Merge pull request #2 from teamcoolguys/master

butts-dylancomp
Merge pull request #20 from Wooyea25/master

Merge pull request #2 from teamcoolguys/master