jade - in progress
jade - work in progress (2)
jade templates
merge master