merge
merge
Get ngtemplates working correctly(combines templates in script.js) & tidy up some code