editing for syntax
something is merged!

Merge branch 'master' of https://github.com/frenetic-lang/frenetic