Committing to allow merge from cluster
Merge branch 'master' of https://github.com/justbennet/parallel_R_workshop

Conflicts:
	t_power/06run_simulation.pbs
	t_power/07run_cluster_setup.pbs