Master
Merge branch 'master' of https://github.com/pepibumur/Talleres-de-programaci-n

Conflicts:
	.DS_Store
	Introducción a Android/Example/gcmServer/Gemfile
	Introducción a Android/Example/gcmServer/Gemfile.lock
	Introducción a Android/Example/gcmServer/app/controllers/api/gcmuser_controller.rb
	Introducción a Android/Example/gcmServer/app/controllers/api/send_push_controller.rb