user:ubuntu added f2, f"
conflict resolved
Merge branch 'master' of https://github.com/shevkoplyas/deleteme