add an entry
Merge branch 'master' of github.com:xmisao/www
modify an entry