Create README.md
Testing project in git
Testing project in git
Merge branch 'cerdo'
Testing project in git
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md