Added scaffolding for weight machine manager db.  It was supposed to be
"weightman", but Rails thinks it's being helpful by pluralizing it.  Thanks
Rails...

 On branch master
 Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
 Changes to be committed:
	new file:   app/assets/javascripts/weightmen.js.coffee
	new file:   app/assets/stylesheets/scaffolds.css.scss
	new file:   app/assets/stylesheets/weightmen.css.scss
	new file:   app/controllers/weightmen_controller.rb
	new file:   app/helpers/weightmen_helper.rb
	new file:   app/models/weightman.rb
	new file:   app/views/weightmen/_form.html.erb
	new file:   app/views/weightmen/edit.html.erb
	new file:   app/views/weightmen/index.html.erb
	new file:   app/views/weightmen/index.json.jbuilder
	new file:   app/views/weightmen/new.html.erb
	new file:   app/views/weightmen/show.html.erb
	new file:   app/views/weightmen/show.json.jbuilder
	modified:   config/routes.rb
	new file:   db/migrate/20140527192832_create_weightmen.rb
	new file:   db/schema.rb
	new file:   test/controllers/weightmen_controller_test.rb
	new file:   test/fixtures/weightmen.yml
	new file:   test/helpers/weightmen_helper_test.rb
	new file:   test/models/weightman_test.rb
Merge branch 'experimental'

Conflicts:
	exzerco-mate-webui/db/schema.rb

 On branch master
 Your branch is up-to-date with 'origin/master'.

 All conflicts fixed but you are still merging.

 Changes to be committed:
	new file:   app/assets/javascripts/weight_data.js.coffee
	new file:   app/assets/stylesheets/weight_data.css.scss
	new file:   app/controllers/weight_data_controller.rb
	new file:   app/helpers/weight_data_helper.rb
	new file:   app/models/weight_data.rb
	new file:   db/migrate/20140528180550_create_weight_data.rb
	modified:   db/schema.rb
	new file:   test/controllers/weight_data_controller_test.rb
	new file:   test/fixtures/weight_data.yml
	new file:   test/helpers/weight_data_helper_test.rb
	new file:   test/models/weight_data_test.rb
Displays all weight data on index page.  Everything else seems to crash.
Hooray, progress!

 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	renamed:    app/assets/javascripts/weight_data.js.coffee -> app/assets/javascripts/exzweights.js.coffee
	deleted:    app/assets/javascripts/weightmen.js.coffee
	renamed:    app/assets/stylesheets/weightmen.css.scss -> app/assets/stylesheets/exzweights.css.scss
	deleted:    app/assets/stylesheets/weight_data.css.scss
	new file:   app/controllers/exzweights_controller.rb
	deleted:    app/controllers/weight_data_controller.rb
	deleted:    app/controllers/weightmen_controller.rb
	new file:   app/helpers/exzweights_helper.rb
	deleted:    app/helpers/weight_data_helper.rb
	deleted:    app/helpers/weightmen_helper.rb
	new file:   app/models/exzweight.rb
	deleted:    app/models/weight_data.rb
	deleted:    app/models/weightman.rb
	renamed:    app/views/weightmen/_form.html.erb -> app/views/exzweights/_form.html.erb
	new file:   app/views/exzweights/edit.html.erb
	new file:   app/views/exzweights/index.html.erb
	new file:   app/views/exzweights/index.json.jbuilder
	new file:   app/views/exzweights/new.html.erb
	renamed:    app/views/weightmen/show.html.erb -> app/views/exzweights/show.html.erb
	renamed:    app/views/weightmen/show.json.jbuilder -> app/views/exzweights/show.json.jbuilder
	deleted:    app/views/weightmen/edit.html.erb
	deleted:    app/views/weightmen/index.html.erb
	deleted:    app/views/weightmen/index.json.jbuilder
	deleted:    app/views/weightmen/new.html.erb
	modified:   config/routes.rb
	deleted:    db/migrate/20140528180550_create_weight_data.rb
	renamed:    db/migrate/20140527192832_create_weightmen.rb -> db/migrate/20140529224108_create_exzweights.rb
	new file:   db/migrate/20140530024702_rename_type_column.rb
	modified:   db/schema.rb
	new file:   test/controllers/exzweights_controller_test.rb
	deleted:    test/controllers/weight_data_controller_test.rb
	deleted:    test/controllers/weightmen_controller_test.rb
	renamed:    test/fixtures/weightmen.yml -> test/fixtures/exzweights.yml
	deleted:    test/fixtures/weight_data.yml
	new file:   test/helpers/exzweights_helper_test.rb
	deleted:    test/helpers/weight_data_helper_test.rb
	deleted:    test/helpers/weightmen_helper_test.rb
	renamed:    test/models/weightman_test.rb -> test/models/exzweight_test.rb
	deleted:    test/models/weight_data_test.rb
Fixed current problems with having changed the column named "type" to
"exercise".

 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	modified:   app/controllers/exzweights_controller.rb
	modified:   app/views/exzweights/_form.html.erb
	modified:   app/views/exzweights/show.html.erb