update template
update template
delete the two picutures
Merge remote-tracking branch 'refs/remotes/origin/master'
update  nutri&append page
Merge remote-tracking branch 'origin/master'
update nutri&append page
vote
Merge branch 'master' of github.com:aijianmei/aijianmei_web
Merge remote-tracking branch 'origin/master' into Chile
vote
daily
update
update page detail ,header
Merge remote-tracking branch 'origin/master' into Chile
commit
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'
update article page
update header.html
dfsafsa