first edits, works fine
Merge branch 'master' of https://github.com/mrjovanovic/digitalramblings