gemfilelock
commented out config_log_path
Merge branch 'master' of heroku.com:shimokitabenbot into release
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge branch 'modify_json_parse_error' of github.com:shimokitabenbot/shimokitabenbot into modify_json_parse_error
Merge remote branch 'heroku/master'
Merge branch 'master' of github.com:shimokitabenbot/shimokitabenbot
Merge branch 'master' of github.com:shimokitabenbot/shimokitabenbot
Merge branch 'develop' of github.com:shimokitabenbot/shimokitabenbot into develop
Merge remote branch 'staging/master' into develop