Cambios en descirption
Merge branch 'master' into develop

Conflicts:
	README.md
Back de intro_joins ... Base de datos en mysql
Cambio para probar pull
Clase 11 de marzo de 2014. Intro a SQL Joins
Merge branch 'develop'
Updating README with instructions
Updating README
Fixed README git merge/push commands description
Updated README with github pull requests link
Updated README instructions step 2
Added missing verb in sentence
Added encoding notice
Added .gitignore
Creating README for TP #1
README for TP #1 updated with basic instructions
* Added static mockup and assets, and ember.js and its dependencies
* Added application and router files.
* Updated markup body to be a handlebars template
* Created application Todo model
* Added fixtures