diff --git a/README.md b/README.md index d72cef5..1475859 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,26 @@ A project based learning activity for people who are getting started with Git and GitHub. fffffffffffffffffffffffffffffffffffffffffffff You can play the game at: https://githubschool.github.io/github-games/ - +gfhdfgjhfgsjhdgfjshdgfjhgsdfjh >> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_ prueba de ejercicio LA MISMA PRUEBA This fun open source game was cloned from: https://github.com/jakesgordon/javascript-tetris + +merge 33333333333333333333333333333 +======= + +mnbmnbmnbmnbmnbmnbnmfdsdf +merge 1 +nbmnbmnbmnbnmfdsdf +merge 2 +nbmnbmnbmnbnmfdsdf +merge 3 +======= + nbmnbmnbmnbnmfdsdf merge 4 +======= merge 5 + diff --git a/index.html b/William.html similarity index 99% rename from index.html rename to William.html index 87e71f8..fe3cd81 100644 --- a/index.html +++ b/William.html @@ -1,7 +1,7 @@
-