Prepared for task 2

minor changes, and whatnot
Merge remote-tracking branch 'origin/master'

Conflicts:
	3702assignment3/src/solution/BayesianNetwork.java
	3702assignment3/src/solution/Main.java