Felix's edits
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Felix's edits
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	templates/synthesisProblemInterface.html