lalala
Merge branch 'master' of https://github.com/lucjb/kaggle-santa

Conflicts:
	.gitignore
moved to package
cosas