git remote add origin https://github.com/garnaga/untitled1.git
git push -u origin master
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
git remote add origin https://github.com/garnaga/untitled1.git
git push -u origin master
Merge remote-tracking branch 'origin/master'

Conflicts:
	Index.html
	Lesson 6 HW.html
	lesson 6/Lesson 6 HW.html