Lauren

Just a merge of database schema.rb file