small changes
Merge branch 'master' of github.com:conflikt/conflikt.github.io