Merge pull request #1 from Masaruau5tralia/dev-prepare-rspec

Dev prepare rspec
Merge branch 'master' of https://github.com/paranishian/movielog
[M] Create dummy data
Merge pull request #13 from Masaruau5tralia/master

ダミーデータ作った
change type of admin_flag
add defalt value to admin_flag of users
Merge pull request #14 from himaratsu/master

UserリストのViewを作成 etc
remove .DS_Store

Merge branch 'master' of https://github.com/paranishian/movielog

Conflicts:
	.DS_Store
Merge pull request #17 from 49hacker/master

.DS_Storeを削除したよ
Delete .DS_Store
Merge pull request #21 from Masaruau5tralia/master

.DS_Store削除と.gitignore
Modify route.rb and Add this for web server
Implement rspec test
Merge pull request #29 from Masaruau5tralia/master

ルーティングとテストとウェブサーバー
Want to use factory girl
Merge pull request #30 from Masaruau5tralia/master

テストでfixtureの代わりにfactorygirl使いたい
DBを拡張

・タグ管理テーブル tags を追加
・reviews にspoiler_flag を追加
・movies に org_id を追加
Merge pull request #35 from 49hacker/master

いいと思います。