added conquerror rc
Merge branch 'master' of github.com:tahti/dotfiles