test
Merge branch 'master' of https://github.com/Sophen/rails_basic
readme and todo fix