Adding projects
Merge branch 'master' of https://github.com/madrid-mobile-developers/piloto_trenes

Conflicts:
	.gitignore
	README.md
Modifying name of the git remote in grunt config