i changed this file
Tom added one pictures .
delete the pictures
update template
i added new css for every.css
i added two rows of contents in 424 and 425 of every.js
i added a effect that made content scroll for every.html
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_front/nutri.html
added two picures
delete the two picutures
i changed layout of share in article.html
i changed layout of share in article.html
like
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
like
asdfggh
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
update  nutri&append page