Initial commit
Testing file add
Merge remote-tracking branch 'ches_git/dev' into Ches

Conflicts:
	README
Ignoring README
Not needed
Not needed
Merge branch 'master' into Javier

Adding .gitignore
Adding .gitignore
Adding .gitignore, removing test.txt
Saving this step for later
Updated README
Merge branch 'Marta'

Should be the same...
Merge branch 'Javier'

Should be up-to-date...