adding null
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/IC/Types/ClassType.java