Merge pull request #46 from MaxMEllon/develop

merge: develop -> master
Merge pull request #47 from MaxMEllon/develop

merge: develop->master
Merge pull request #48 from MaxMEllon/develop

merge: develop -> master
Merge pull request #49 from MaxMEllon/develop

merge: develop -> master
Merge pull request #50 from MaxMEllon/develop

merge: develop -> master
Merge pull request #57 from MaxMEllon/develop

merge: develop -> master
fix: application.rbにタイムスタンプの設定追記
fix: blog/show 更新順に表示するように
fix: blog-showがblog-indexに干渉していたためcssの表示を調整
Merge pull request #59 from MaxMEllon/hot-fix

merge: hot-fix -> develop