バグ習性
メニューに追加
Merge branch 'master' of https://github.com/goldrush/goldrush

Conflicts:
	app/models/business_partner.rb
	app/views/layouts/application.html.erb
Merge pull request #16 from qtamaki/master

bugfix
add_details画面追加
database.ymlをorgに分ける
Merge pull request #17 from qtamaki/master

プルして
Merge branch 'master' of https://github.com/qTanakaSatomip/goldrush
add_detailsのフォルダを移動
rails 3.2.6->3.2.13
Merge pull request #18 from qtamaki/master

プルして
delivery_mail/new 画面 → bp_pic_groups/show 画面への遷移を実装
Merge branch 'master' of https://github.com/qTanakaSatomip/goldrush
Merge branch 'master' of https://github.com/goldrush/goldrush
bp_pic_groups/new 画面 → bp_pic_groups/show 画面 → delivery_mails/show 画面 の遷移を実装