updated config file, serve not working
Merge branch 'master' of github.com:hollocherDale/learn-rails