edited home info and page.html
Merge remote-tracking branch 'origin/master'
edited home info and page.html