param changes
Merge branch 'master' of https://github.com/asadat/nuc

Conflicts:
	launch/sim_param.yaml