Merge branch 'master' into changjian/constraintGraph

Conflicts:
	.classpath
	bin/edu/uci/ics/cs243/cfa/types/ConstraintGraph.class
	bin/edu/uci/ics/cs243/cfa/types/ConstraintGraphNode.class
	src/edu/uci/ics/cs243/cfa/data/Project3Test.java
	src/edu/uci/ics/cs243/cfa/types/ConstraintGraph.java
	src/edu/uci/ics/cs243/cfa/types/RootGraphNodeSet.java
delete
settings
dsad
Merge remote-tracking branch 'origin/nanzhang/io-connect' into changjian/constraintGraph

Conflicts:
	src/edu/uci/ics/cs243/cfa/types/ConstraintGraph.java