moving html to jade and using less
Merge remote-tracking branch 'origin/master'