Starting to work
Model/table setup is complete
Merge branch 'master' into controller

Conflicts:
	Gemfile.lock