Merge pull request #47 from missoby/master

web
Update
Merge pull request #48 from missoby/master

design
Update
Update
Update
design