On branch master
 Initial commit
	new file:   .gitignore
	new file:   Gemfile
	new file:   Gemfile.lock
	new file:   README.rdoc
	new file:   Rakefile
	new file:   app/assets/images/.keep
	new file:   app/assets/javascripts/application.js
	new file:   app/assets/stylesheets/application.css
	new file:   app/controllers/application_controller.rb
	new file:   app/controllers/concerns/.keep
	new file:   app/helpers/application_helper.rb
	new file:   app/mailers/.keep
	new file:   app/models/.keep
	new file:   app/models/concerns/.keep
	new file:   app/views/layouts/application.html.erb
	new file:   bin/bundle
	new file:   bin/rails
	new file:   bin/rake
	new file:   bin/spring
	new file:   config.ru
	new file:   config/application.rb
	new file:   config/boot.rb
	new file:   config/database.yml
	new file:   config/environment.rb
	new file:   config/environments/development.rb
	new file:   config/environments/production.rb
	new file:   config/environments/test.rb
	new file:   config/initializers/assets.rb
	new file:   config/initializers/backtrace_silencers.rb
	new file:   config/initializers/cookies_serializer.rb
	new file:   config/initializers/filter_parameter_logging.rb
	new file:   config/initializers/inflections.rb
	new file:   config/initializers/mime_types.rb
	new file:   config/initializers/session_store.rb
	new file:   config/initializers/wrap_parameters.rb
	new file:   config/locales/en.yml
	new file:   config/routes.rb
	new file:   config/secrets.yml
	new file:   db/seeds.rb
	new file:   lib/assets/.keep
	new file:   lib/tasks/.keep
	new file:   log/.keep
	new file:   public/404.html
	new file:   public/422.html
	new file:   public/500.html
	new file:   public/favicon.ico
	new file:   public/robots.txt
	new file:   test/controllers/.keep
	new file:   test/fixtures/.keep
	new file:   test/helpers/.keep
	new file:   test/integration/.keep
	new file:   test/mailers/.keep
	new file:   test/models/.keep
	new file:   test/test_helper.rb
	new file:   vendor/assets/javascripts/.keep
	new file:   vendor/assets/stylesheets/.keep
 On branch master
 Initial commit
	new file:   .gitignore
	new file:   Gemfile
	new file:   Gemfile.lock
	new file:   README.rdoc
	new file:   Rakefile
	new file:   app/assets/images/.keep
	new file:   app/assets/javascripts/application.js
	new file:   app/assets/stylesheets/application.css
	new file:   app/controllers/application_controller.rb
	new file:   app/controllers/concerns/.keep
	new file:   app/helpers/application_helper.rb
	new file:   app/mailers/.keep
	new file:   app/models/.keep
	new file:   app/models/concerns/.keep
	new file:   app/views/layouts/application.html.erb
	new file:   bin/bundle
	new file:   bin/rails
	new file:   bin/rake
	new file:   bin/spring
	new file:   config.ru
	new file:   config/application.rb
	new file:   config/boot.rb
	new file:   config/database.yml
	new file:   config/environment.rb
	new file:   config/environments/development.rb
	new file:   config/environments/production.rb
	new file:   config/environments/test.rb
	new file:   config/initializers/assets.rb
	new file:   config/initializers/backtrace_silencers.rb
	new file:   config/initializers/cookies_serializer.rb
	new file:   config/initializers/filter_parameter_logging.rb
	new file:   config/initializers/inflections.rb
	new file:   config/initializers/mime_types.rb
	new file:   config/initializers/session_store.rb
	new file:   config/initializers/wrap_parameters.rb
	new file:   config/locales/en.yml
	new file:   config/routes.rb
	new file:   config/secrets.yml
	new file:   db/seeds.rb
	new file:   lib/assets/.keep
	new file:   lib/tasks/.keep
	new file:   log/.keep
	new file:   public/404.html
	new file:   public/422.html
	new file:   public/500.html
	new file:   public/favicon.ico
	new file:   public/robots.txt
	new file:   test/controllers/.keep
	new file:   test/fixtures/.keep
	new file:   test/helpers/.keep
	new file:   test/integration/.keep
	new file:   test/mailers/.keep
	new file:   test/models/.keep
	new file:   test/test_helper.rb
	new file:   vendor/assets/javascripts/.keep
	new file:   vendor/assets/stylesheets/.keep
 On branch develop

 Got exercise_id working in all show edit index(but not with on form creation functionality...will be a feature).  Prob work on seeding workouts from prev db first.
 On branch develop
Trying to fix gitignore for swp and un~ files extensions...
	new file:   ..gitignore.un~
	modified:   .gitignore
	deleted:    .swp
	deleted:    app/controllers/.workouts_controller.rb.swp
	modified:   app/controllers/.workouts_controller.rb.un~
	modified:   app/controllers/workouts_controller.rb
	deleted:    app/models/.exercise.rb.swp
	deleted:    app/models/.workout.rb.swp
	deleted:    app/views/workouts/._form.html.erb.swp
	modified:   app/views/workouts/._form.html.erb.un~
	deleted:    app/views/workouts/.edit.html.erb.swp
	deleted:    app/views/workouts/.index.html.erb.swp
	modified:   app/views/workouts/.index.html.erb.un~
	deleted:    app/views/workouts/.new.html.erb.swp
	deleted:    app/views/workouts/.show.html.erb.swp
	modified:   app/views/workouts/.show.html.erb.un~
	deleted:    app/views/workouts/.show.json.jbuilder.swp
	modified:   app/views/workouts/index.html.erb
	modified:   db/.seeds.rb.un~
	deleted:    db/migrate/.20140916181501_create_exercises.rb.swp
	deleted:    db/migrate/.20140916182754_create_workouts.rb.swp
	modified:   db/seeds.rb

	modified:   ..gitignore.un~
	modified:   .gitignore
 Committer: na <na@railsServer>
 On branch develop
	modified:   .gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
	config/routes.rb
	db/seeds.rb

 Committer: na <na@railsServer>
	new file:   ..gitignore.un~
	modified:   .gitignore
	new file:   LICENSE
	new file:   README.md
	new file:   app/assets/javascripts/exercises.js.coffee
	new file:   app/assets/javascripts/workouts.js.coffee
	new file:   app/assets/stylesheets/exercises.css.scss
	new file:   app/assets/stylesheets/scaffolds.css.scss
	new file:   app/assets/stylesheets/workouts.css.scss
	new file:   app/controllers/.workouts_controller.rb.un~
	new file:   app/controllers/exercises_controller.rb
	new file:   app/controllers/workouts_controller.rb
	new file:   app/helpers/exercises_helper.rb
	new file:   app/helpers/workouts_helper.rb
	new file:   app/models/.exercise.rb.un~
	new file:   app/models/.workout.rb.un~
	new file:   app/models/exercise.rb
	new file:   app/models/workout.rb
	new file:   app/views/exercises/_form.html.erb
	new file:   app/views/exercises/edit.html.erb
	new file:   app/views/exercises/index.html.erb
	new file:   app/views/exercises/index.json.jbuilder
	new file:   app/views/exercises/new.html.erb
	new file:   app/views/exercises/show.html.erb
	new file:   app/views/exercises/show.json.jbuilder
	new file:   app/views/workouts/._form.html.erb.un~
	new file:   app/views/workouts/.index.html.erb.un~
	new file:   app/views/workouts/.show.html.erb.un~
	new file:   app/views/workouts/_form.html.erb
	new file:   app/views/workouts/edit.html.erb
	new file:   app/views/workouts/index.html.erb
	new file:   app/views/workouts/index.json.jbuilder
	new file:   app/views/workouts/new.html.erb
	new file:   app/views/workouts/show.html.erb
	new file:   app/views/workouts/show.json.jbuilder
	modified:   config/routes.rb
	new file:   db/.seeds.rb.un~
	new file:   db/migrate/.20140916182754_create_workouts.rb.un~
	new file:   db/migrate/20140916181501_create_exercises.rb
	new file:   db/migrate/20140916182754_create_workouts.rb
	new file:   db/schema.rb
	modified:   db/seeds.rb
	new file:   test/controllers/exercises_controller_test.rb
	new file:   test/controllers/workouts_controller_test.rb
	new file:   test/fixtures/exercises.yml
	new file:   test/fixtures/workouts.yml
	new file:   test/helpers/exercises_helper_test.rb
	new file:   test/helpers/workouts_helper_test.rb
	new file:   test/models/exercise_test.rb
	new file:   test/models/workout_test.rb