working on parsing observations
Merge branch 'master' of https://github.com/themikesmith/mlcd-hw2.git

Conflicts:
	estimate_params/src/elanmike/mlcd/hw2/Network.java
Merge branch 'master' of https://github.com/themikesmith/mlcd-hw2.git