thumb Gemfile
master merge user branch
fix the user
prepare for excel
Merge branch 'wang/user'