update blogs/index.html.erb
add user_settings
add products
add tops, settings/index, trades/history
Merge remote-tracking branch 'upstream/master'
add friends search button
edit history
Merge pull request #36 from takanashi66/master

なんかもういろいろ追加
#知らんけど