git ignore
git ignore
conflict
Merge remote-tracking branch 'upstream/master'
fix conflit of admin
Merge pull request #33 from Ailenswpu/master

fix the conflict of rails_admin
fixed typo problem