Merge branch 'refs/heads/priska-braitenberg'
Merge branch 'master' of github.com:joschabach/micropsi2
Fixing gate type check
Merge branch 'master' of github.com:joschabach/micropsi2