Join tables
More model fun
Merge branch 'models'

Conflicts:
	db/schema.rb