Modifying to match style guide
Merge pull request #160 from maxmarchuk/styleguide_templates

Modifying to match style guide