test
Merge branch 'master' of https://github.com/GDGLima/gdayx2013

Conflicts:
	Web/pruebas/js/app.js