Merge branch 'master' of https://github.com/raphg/Biostat-578

Conflicts:
	.gitignore