init
Merge branch 'master' of github.com:hitzhong/admin_framework_from_unicorn
modify .gitignore