empty the file
resolve merge conflict in test_frame.json
Merge branch 'master' of https://github.com/tborisova/hackfmi4
Merge branch 'master' of https://github.com/tborisova/hackfmi4
Merge branch 'master' of https://github.com/tborisova/hackfmi4
polish and stuff
Merge branch 'master' of https://github.com/tborisova/hackfmi4