init 396
Merge branch 'master' of https://github.com/bay6/railscasts
add import csv
add roo