changes
Merge branch 'master' of https://github.com/dietricherwane/h-backward

Conflicts:
	app/controllers/pay_money_controller.rb
	log/development.log
changes