add shop.html
add general page.html
Merge branch 'master' of github.com:arifriyanto/thisishahan