edit header
Merge branch 'new_style_guide' of github.com:makersquare/papalote into new_style_guide