New modeling

Conflicts:
	db/schema.rb
Merge pull request #22 from ilovearsenal93/newmodeling

New modeling