note about rails4
Merge branch 'master' of github.com:comfy/comfortable-mexican-sofa