source1
Merge branch 'master' of https://github.com/oblarquez/paleofiRe

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/oblarquez/paleofiRe