inital modeling
initial modeling
new form
Merge branch 'lists'

Conflicts:
	db/development.sqlite3
	db/schema.rb