Fix indentation
Merge branch 'master' of https://github.com/avijohnson/changeup

Conflicts:
	app/views/budgets/new.html.erb