Parameter defaults
Merge branch 'master' of https://github.com/cgpotts/annualreview-complearning

Conflicts:
	complearning.py