Merge branch 'master' of https://github.com/hoonkong/Controls-Gallery

Conflicts:
index.html
more update
update
Merge branch 'master' of https://github.com/hoonkong/Controls-Gallery