rails 4.1 upgrade
Merge branch 'basics_01' into basics_02
name fix-
gitignore