i changed the confi.inc.ph
Tom adde one picture
delete the image at branch of Tom
like
Merge branch 'master' of github.com:aijianmei/aijianmei_web
Add two pictures
Merge branch 'refs/heads/MianBranch'
Merge remote-tracking branch 'refs/remotes/origin/master'
login
Merge branch 'master' of github.com:aijianmei/aijianmei_web
register
Merge remote-tracking branch 'origin/master'
i delete two files at master branch
train
Merge remote-tracking branch 'refs/remotes/origin/master'
i added two files
i delete two file a the master branch .
fix the Train page
Merge branch 'master' of github.com:aijianmei/aijianmei_web
added two files .