Forgot to upload schema.rb with my migration
Merge branch 'development' of github.com:caniscide/SofA into development

Conflicts:
	db/schema.rb