BOOTSTRAPPED
Merge conflict
Merge pull request #24 from JohnathanWeisner/master

MERGE ME SEMORE!