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

Conflicts:
	index.html
	lesson 7/lesson7.js
Merge branch 'gh-pages'