First commit with the working project
Add a README for the repository
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md