added conf.rb to git ignore
pulled conf.rb from git