Esquema de base de datos concuerda con la documentacion.
Merge branch 'Fixed'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/problems_controller.rb
	app/controllers/solutions_controller.rb
	app/models/user.rb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	app/views/problems/_form.html.erb
	app/views/problems/index.html.erb
	app/views/problems/index.json.jbuilder
	app/views/problems/show.html.erb
	app/views/problems/show.json.jbuilder
	app/views/solutions/_form.html.erb
	app/views/solutions/index.html.erb
	app/views/solutions/index.json.jbuilder
	app/views/solutions/show.html.erb
	app/views/solutions/show.json.jbuilder
	config/initializers/devise.rb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb
	test/controllers/problems_controller_test.rb
	test/controllers/solutions_controller_test.rb
	test/fixtures/problems.yml
	test/fixtures/solutions.yml
	test/fixtures/users.yml