working on templates
Merge branch 'master' of https://github.com/catelevator/catelevator into mads
still messing with templates
Merge branch 'master' of https://github.com/catelevator/catelevator into mads