I have now added another file, file4
Mike also adjusted the README file
I changed NOTHING... will it accept this??

Merge branch 'master' of github.com:lazarillo/test

Conflicts:
	README.md