Merge branch 'isDummy2'

Conflicts:
src/Type.java