Merge pull request #1 from RandyKahle/develop

Initial set of templates