gitignore
Merge branch 'master' of https://github.com/marionmari/pyGPs

Conflicts:
	.gitignore
test