Adding jade files
Merge branch 'master' into laptop