test
fixed merged conflit - Josh
Templates Tentative - Josh
Merge branch 'master' of https://github.com/lorddlazaro/Coslet