State
olmkomiko
ploo
algo
Merge branch 'master' of https://github.com/normandanielmq/ProyectoTest

Conflicts:
	Cliente/appTestCliente/appTestCliente/Models/Test.cs
	Cliente/appTestCliente/appTestCliente/Views/ResolveTest/index.cshtml
	ServicioWeb/appTest/app/models/test.rb
	ServicioWeb/appTest/db/migrate/20130420005256_poblar_datos_de_test.rb