Creating project and initial files
Resolving conflict of initial pull after setting the upstream

Conflicts:
	README.md