fixed merge conflicts in seed
Merge pull request #18 from Eventalist/yoshiemuranaka

Yoshiemuranaka
models & collections
Merge pull request #19 from Eventalist/theerickramer

Theerickramer
Delete seed.rb
added backbone models, collections, eventView