コンフリクトを解消
Gemgile.lock修正
database.yml.sampe added
ignore add
Merge pull request #4 from ManabuSeki/fetuar/csv

Fetuar/csv
fix