Update code to fit with jade
Converted html pages
Merge branch 'html-2-jade'