merge conflicts
Code to get the list of stages
Merge branch 'master' of github.com:dxw/rsparly2013
Merge branch 'master' of github.com:dxw/rsparly2013
Merge branch 'master' of github.com:dxw/rsparly2013
adding a diff method
Merge branch 'master' of github.com:dxw/rsparly2013

Conflicts:
	lib/diff_bill.rb