Merge pull request #12 from passdan/master

Fix the branch conflict
Revert "Fix the branch conflict"
Merge pull request #13 from passdan/revert-12-master

Revert "Fix the branch conflict"
Merge pull request #14 from passdan/new_web

New web