data-driven vs generative modeling segue
Merge branch 'master' of https://github.com/davidwhogg/SaveKepler

Conflicts:
	whitepaper/sk.tex