Merge branch 'master' of https://github.com/AndresOtero/TallerII-Tinder

AndresOtero · Apr 28, 2016 · dc8afc0 · dc8afc0
2 parents 777f5c7 + e6d9fb5
commit dc8afc0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,8 @@
-# TallerII-Tinder
+# TallerII-Tinder
+AppServer MatchApp
+Funcion								Script
+Para instalar los paquetes necesarios para correr el programa: beforeinstall.sh
+Para compilar el proyecto y sus pruebas:                       build.sh
+Para correr test unitarios:				       Test.sh
+Para correr la aplicacion:				       Tinder.sh
+Para correr los test unitarios:				       requests.py
diff --git a/README.md~ b/README.md~
@@ -0,0 +1 @@
+# TallerII-Tinder
diff --git a/Taller_de_programacion_II_Instalar_paquetes.odt b/Taller_de_programacion_II_Instalar_paquetes.odt
diff --git a/executar.sh b/executar.sh