aligned leaders
fixed merge conflicts
Merge pull request #30 from Bontgoy/ScottTryinStuffs

Scott tryin stuffs