updating conf.lua and main.lua
Merge branch 'master' of github.com:pi399/cobalt into music