modified:   simulation_analysis.py
	modified:   simulation_plots.py
	modified:   ../simulate.py
	modified:   ../user_model/Parameters.py
Merge branch 'colleague_game_branch' of https://github.com/jiyinhe/fedweb_ui into colleague_game_branch