changes to js
merging master
building tempaltes
minor change to framework
building template
merged emily into amy
added handlebars and fixed templating logic