Merge branch 'master' into visions-of-schedules
So broken, oh so broken

But we’re collaborating….don’t touch this. It is horrific and shouldn’t
go anywhere
First commit to branch database
More data added to seeds.rb
Lots of additions to seeds.rb
Merge pull request #1 from gaurimishra/database

Database additions to seeds.rb