edit config
Merge branch 'master' of github.com:wufniks/wufniks.github.com