added the schema
Merge branch 'master' into lauren

Built a fresh version of the db/schema.rb
Conflicts:
	db/schema.rb
Merge pull request #5 from lukemesiti/lauren

Lauren