all the shit is indented YE BOI
Merge pull request #22 from edallman/master

all the shit is indented YE BOI