Merge pull request #18 from stevendgonzales/master

add template files
Merge remote-tracking branch 'upstream/master'