add memcache-client "dalli"
add sort feature on movies and update seeds file
modified sort feature
[M] Implement review
[M] Implement pagination on listing pages
 gitignoreに.swpファイルを追加
add spec for sort features
Merge pull request #45 from himaratsu/master

マイページ追加 + Follow/Unfollowに論理削除導入 ほか
Merge branch 'master' of https://github.com/paranishian/movielog

* modified sort test

Conflicts:
	app/models/movie.rb
	config/routes.rb
	db/seeds/development/movies.rb
Merge pull request #47 from 49hacker/master

コンフリクト解消、sortテストの改修
add page header
[M] Modify review
Merge pull request #48 from Masaruau5tralia/master

レビュー修正
Merge branch 'master' of https://github.com/paranishian/movielog
revive dalli store!!
Merge pull request #50 from 49hacker/master

dalliストアのコメントアウトを削除
Merge branch 'master' of https://github.com/paranishian/movielog
add review module to mypage