omg
Merge pull request #21 from joverall22/master

omfg
merged
Merge pull request #20 from eanplatter/master

omfg it's 2am