fix some bug
Merge branch 'refactor' of github.com:sdlong/rails_learn into refactor