additional functionality
Merge branch 'master' of https://github.com/yukuan/rails-project