Added a new model for exercise machines.

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

 Changes to be committed:
	new file:   app/assets/javascripts/machines.js.coffee
	new file:   app/assets/stylesheets/machines.css.scss
	new file:   app/controllers/machines_controller.rb
	new file:   app/helpers/machines_helper.rb
	new file:   app/models/machine.rb
	modified:   app/views/layouts/application.html.erb
	new file:   app/views/machines/_form.html.erb
	new file:   app/views/machines/edit.html.erb
	new file:   app/views/machines/index.html.erb
	new file:   app/views/machines/index.json.jbuilder
	new file:   app/views/machines/new.html.erb
	new file:   app/views/machines/show.html.erb
	new file:   app/views/machines/show.json.jbuilder
	modified:   config/routes.rb
	new file:   db/migrate/20140610192040_create_machines.rb
	modified:   db/schema.rb
	new file:   test/controllers/machines_controller_test.rb
	new file:   test/fixtures/machines.yml
	new file:   test/helpers/machines_helper_test.rb
	new file:   test/models/machine_test.rb
Added routes for machines.  Also modified exzweight form to show exercise
machine type, model, and company.

TO DO:
- Next step is to make sure that user cannot enter combinations of type,
model, and company that are not in the database.  At least not without
being asked if they wish to add a new entry to machines.

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

 Changes to be committed:
	modified:   app/models/machine.rb
	modified:   app/views/exzweights/_form.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20140610200408_adapt_exzweights_to_machines.rb
Added foreign key constraint between exzweight and machine.  Set up relation
between exzweight where 1 exzweight has 1 machine.

Also, changed exzweight forms to display machine as company / model /
exercise_type.

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

 Changes to be committed:
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/exzweights_controller.rb
	modified:   app/controllers/machines_controller.rb
	modified:   app/models/exzbike.rb
	modified:   app/models/exzweight.rb
	modified:   app/models/machine.rb
	modified:   app/views/exzweights/_form.html.erb
	modified:   app/views/exzweights/index.html.erb
	modified:   app/views/exzweights/show.html.erb
	modified:   config/routes.rb
	deleted:    db/migrate/20140610200408_adapt_exzweights_to_machines.rb
	new file:   db/migrate/20140611132115_fit_exzweight_to_machine.rb
	new file:   db/migrate/20140611133314_remove_model_from_exzweight.rb
	new file:   db/migrate/20140617175556_add_foreign_key_to_exzweight.rb
	new file:   db/migrate/20140617195058_change_date_default.rb
	modified:   db/schema.rb
Flashes are working with help of code from travis-on-rails.
see: http://travisonrails.com/2008/08/17/working-with-the-flash-hash

CSV upload is still buggy.

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

 Changes to be committed:
	modified:   app/controllers/exzweights_controller.rb
	new file:   app/helpers/link_to_function_helper.rb
	modified:   app/models/exzweight.rb
	modified:   app/views/layouts/application.html.erb
Now adds machines from csv files.  'Exercise type', must be listed in the
csv header as 'exercise' though.  Weight data from csv is not added at all.

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

 Changes to be committed:
	modified:   app/controllers/exzweights_controller.rb
	modified:   app/controllers/machines_controller.rb
	modified:   app/models/exzweight.rb
	modified:   app/models/machine.rb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/machines/index.html.erb
	modified:   config/routes.rb
Now saves entries from uploaded csv for exzweights.  Seems rather slow though.

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

 Changes to be committed:
	modified:   app/controllers/exzweights_controller.rb
	modified:   app/models/exzweight.rb