modify: ランキングテーブル追加, right-bar削除
Merge pull request #71 from MaxMEllon/fix-layout

merge: fix-layout -> develop
modify: indexにサイト内検索バーのモック追加
Merge pull request #72 from MaxMEllon/modify-index

merge: modify-index -> develop
fix: 細かい調整
generate: kaminari に bootstrap3 を適用
Merge branch 'master' into develop
install: factory-girl
install: shoulda-matchers
config: require 'shoulda-matchers'
config: factory-girl
Merge pull request #74 from MaxMEllon/install-factory-girl

marge: install-factroy-girl -> develop
BlogとArticleの関連テスト追加
test: Categoryのテスト追加
test: userテストの追加
Merge pull request #75 from MaxMEllon/test

merge: test -> develop
Merge pull request #76 from MaxMEllon/develop

merge: develop -> master