local frichs changes
Merge branch 'master' of https://github.com/pylgrym/first_app