bla
Merge branch 'master' of https://github.com/timsf/stats-gse

Conflicts:
	doc/pt1.pdf
gitignore fix