merge one
Merge branch 'master' of github.com:inasens/Git

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/gastos.js.coffee
	app/views/gastos/index.html.erb
	app/views/layouts/application.html.erb