New Formatting/Styling
Merge pull request #11 from berjoyner/master

New Formatting/Styling
added template and underscore
Merge pull request #12 from shawnlknight/master

added template and underscore