Merge remote-tracking branch 'origin/master'

Conflicts:
	3702assignment3/bin/solution/BayesianNetwork.class
	3702assignment3/bin/solution/Main.class