updated email
Merge branch 'master' of https://github.com/yukuan/rails-project
Merge branch 'master' of https://github.com/yukuan/rails-project