list2maybe changes
first attempt at mergey stuff wish me luck

Merge branch 'master' of https://github.com/pitakakariki/simr

Conflicts:
	R/powerSim.R
still trying to merge