reformat and rearrange
Merge branch master of github.com:willwashburn/HTMLStrap-PHP