stream html edit
barnch test
Merge branch 'master' of github.com:fromjaga/test into test
Merge branch 'test' of https://github.com/fromjaga/test
Delete test file