git add the ignore file
add the gitignore file
i merge because i got the updated codes from kelvin zheng
Merge branch 'master' of github.com:aijianmei/aijianmei_web
Merge branch 'master' of github.com:aijianmei/aijianmei_web
Merge remote-tracking branch 'origin/master' into Annbranch
asdff
INDEX
sdfd
login
delete