Added Templates
Added EMsweeney stuff

Merge branch 'master' of https://github.com/muschellij2/ENAR_SC_2015