edit
aMerge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
cmt
edit farmerblog menu & add jquery.farmer.js
admin/usersのtd問題解決
崩れの修正
column check
jquery.masonry update
bag fix
Merge pull request #48 from takanashi66/master

いろいろやった