quick commit
Adds several templates
Merge branch 'erb-branch'
Merge pull request #6 from ErikPeterson/pull-branch

Pull branch