typo corrected
Merge remote-tracking branch 'upstream/master' into railsgirlshh
correctly hiding senor dev