Merge branch 'master' of https://github.com/Masaruau5tralia/movielog
Merge pull request #1 from Masaruau5tralia/master

なんだてめーこのやろー
Ready for RSpec test environment
Delete test/ to use guard for test
Delete unnecessary schema
Merge pull request #9 from Masaruau5tralia/dev-prepare-rspec

Dev prepare rspec
モデルを作成

・Categoryモデルは削除
db/schema.rb のコンフリクトを解消

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

Conflicts:
	db/schema.rb