table user
Merge branch 'master' of https://github.com/inasens/Rails-app

Conflicts:
	app/assets/javascripts/users.js.coffee
	app/views/layouts/application.html.erb
	db/schema.rb
Merge branch 'master' of https://github.com/inasens/Rails-app

Conflicts:
	app/views/users/index.html.erb
javascript functionality
Merge branch 'master' of https://github.com/inasens/Rails-app

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/gastos.js.coffee
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/controllers/gastos_controller.rb
	app/helpers/application_helper.rb
	app/models/account.rb
	app/models/gasto.rb
	app/models/user.rb
	app/views/devise/registrations/_form.html.erb
	app/views/gastos/_form.html.erb
	app/views/gastos/index.html.erb
	app/views/gastos/new.html.erb
	app/views/gastos/show.html.erb
	app/views/layouts/_navigation.html.erb
	app/views/layouts/_navigation_links.html.erb
	app/views/layouts/application.html.erb
	app/views/users/_user.html.erb
	app/views/users/index.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/inasens/Rails-app

Conflicts:
	app/models/account.rb
	app/models/gasto.rb
	app/views/layouts/_navigation.html.erb
	app/views/layouts/_navigation_links.html.erb
	app/views/users/_user.html.erb
	db/schema.rb