Merge pull request #2 from bpred754/master

adsf
Merge pull request #4 from helikaon00/master

This is gay