out of school study time
fixed conflict

Merge branch 'master' of github.com:ijlyttle/isu_pisa

Conflicts:
	paper/paper.Rmd