changes index
Merge branch 'master' of github.com:inasens/Git

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