naming fix
rails 4.1 upgrade
Merge branch 'basics_01' into basics_02
Merge branch 'basics_02' into basics_03
Merge branch 'basics_03' into basics_04
accessor fix