Merge pull request #20 from daven009/master

update
add kadira, viewport to main.html
Merge https://github.com/ycswaves/yamatoV09