Add new templates
Update templates
Merge pull request #12 from stuycs-softdev/judy

Update templates
Merge branch 'dev' into ben