edit settings
Merge branch 'master' of https://github.com/dwit27/dwit27.github.io
i dont get merges