Merge pull request #13 from Masaruau5tralia/master

ダミーデータ作った
create user_list template pages.
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