updated
Merge branch 'master' of github.com:zachary-foster/Templates