Initial commit
first commit
first commit
My first commit
Merge https://github.com/steevelaquitaine/SLcodes
first commit
first commit
merge branch 'master' of https://github.com/steevelaquitaine/SLcodes

Merging local and online repository
Merge branch 'master' of https://github.com/steevelaquitaine/ExpCodesPsychophy

Conflicts:
	README.md

 All conflicts fixed but you are still merging.