Merge pull request #7 from Align/master

pull changes
template files
Merge pull request #10 from Align/matt-dev

template files for team