article
article
ignore runtime cache
i changed the confi.inc.ph
Tom added one picture for testing !
i delete one picture at the mater branch `
Merge branch 'Annbranch'
SDDR
FDDRTH
DS
git set the the gitignore file
Merge branch 'Annbranch'

Conflicts:
	.DS_Store
delete the .DSfiel
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store
Merge remote-tracking branch 'origin/master'
Merge branch 'Annbranch' dsghj
Merge branch 'master' of github.com:aijianmei/aijianmei_web
i added the PoweredByMacOSx.gif
Merge branch 'master' of github.com:aijianmei/aijianmei_web
i add some files