not sure if script works
Merge branch 'master' of https://github.com/themikesmith/mlcd-hw3.git

Conflicts:
	edu/jhu/cs/elanmike/GibbsSampler.java