Merge branch 'master' of github.com:ridget/transactions

Conflicts:
	app/helpers/to-currency.js
Merge remote-tracking branch 'origin/master' into section_2

Conflicts:
	app/helpers/to-currency.js
# 50-character subject line
#
# 72-character wrapped longer description. This should answer:
#
# * Why was this change necessary?
# * How does it address the problem?
# * Are there any side effects?
#
# Include a link to the ticket, if any.
Merge branch 'section_2' of github.com:ridget/transactions into section_2

Conflicts:
	app/helpers/to-currency.js
	app/router.js
	app/templates/transactions/new.hbs