fixed some settings
Merge branch 'master' of github.com:cgelberg/learning_ruby1
fixed some settings