progress
add new templates
Merge branch 'master' of github.com:jennazee/diversity