Inyoung d8bdc14335 Fixing merge conflict 7 gadi atpakaļ
..
app.cpython-35.pyc d8bdc14335 Fixing merge conflict 7 gadi atpakaļ