Header foundation
Merge pull request #1 from ssniteman/shane

Header foundation
fixed merge conflicts