first commit
Merging with model
merged code
relations
working on case when you have no goal
Test 3 passed, drop a good answer without a goal
Prueba 3 con fallo a la hora de no poner meta
Edit landing page and login with facebook
Merge branch 'master' of github.com:engineer/carteramagic
Git status
Asdº
Pasó la prueba para más de dos metas
Modified index for load popup image
Add frontend for carteramagic and redirect login to dashboard
Primer version del modelo lista
Merge branch 'master' of http://github.com/engineer/carteramagic

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/admin.css
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/dashboard.css.scss
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/user.rb
	app/views/dashboard/index.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/layouts/_messages.html.erb
	app/views/layouts/_navigation.html.erb
	config/application.rb
	config/environments/production.rb
	config/routes.rb