cleaning up framework
merging master
building tempaltes
minor change to framework
building template
merged emily into amy
added handlebars and fixed templating logic
resolved merge conflict with master
minor change to tweak template data