Änderungen eingefügt
deleting
Löschung
Merge branch 'dhell'

Conflicts:
	shop/app/views/layouts/application.html.erb
	shop/config/routes.rb
	shop/db/development.sqlite3
	deleted:    README.md
	deleted:    a.txt
	deleted:    b.txt
	deleted:    readMe.txt
	deleted:    shop/app/views/layouts/application.html.erb
	deleted:    shop/config/routes.rb
	deleted:    shop/db/development.sqlite3
	deleted:    shop/log/development.log
	deleted:    shoperw/.gitignore
	deleted:    shoperw/Gemfile
	deleted:    shoperw/Gemfile.lock
	deleted:    shoperw/Gemfile~
	deleted:    shoperw/MIT-LICENSE
	deleted:    shoperw/README.rdoc
	deleted:    shoperw/Rakefile
	deleted:    shoperw/app/assets/images/shoperw/.keep
	deleted:    shoperw/app/assets/javascripts/application.js
	deleted:    shoperw/app/assets/javascripts/shoperw/application.js
	deleted:    shoperw/app/assets/javascripts/shoperw/categories.js
	deleted:    shoperw/app/assets/javascripts/shoperw/items.js
	deleted:    shoperw/app/assets/stylesheets/application.css
	deleted:    shoperw/app/assets/stylesheets/scaffold.css
	deleted:    shoperw/app/assets/stylesheets/shoperw/application.css
	deleted:    shoperw/app/assets/stylesheets/shoperw/categories.css
	deleted:    shoperw/app/assets/stylesheets/shoperw/items.css
	deleted:    shoperw/app/controllers/shoperw/application_controller.rb
	deleted:    shoperw/app/controllers/shoperw/application_controller.rb~
	deleted:    shoperw/app/controllers/shoperw/categories_controller.rb
	deleted:    shoperw/app/controllers/shoperw/items_controller.rb
	deleted:    shoperw/app/controllers/shoperw/items_controller.rb~
	deleted:    shoperw/app/helpers/shoperw/application_helper.rb
	deleted:    shoperw/app/helpers/shoperw/categories_helper.rb
	deleted:    shoperw/app/helpers/shoperw/items_helper.rb
	deleted:    shoperw/app/models/shoperw/category.rb
	deleted:    shoperw/app/models/shoperw/category.rb~
	deleted:    shoperw/app/models/shoperw/item.rb
	deleted:    shoperw/app/models/shoperw/item.rb~
	deleted:    shoperw/app/uploaders/shoperw/item_image_uploader.rb
	deleted:    shoperw/app/uploaders/shoperw/item_image_uploader.rb~
	deleted:    shoperw/app/views/shoperw/categories/_form.html.erb
	deleted:    shoperw/app/views/shoperw/categories/edit.html.erb
	deleted:    shoperw/app/views/shoperw/categories/edit.html.erb~
	deleted:    shoperw/app/views/shoperw/categories/index.html.erb
	deleted:    shoperw/app/views/shoperw/categories/index.html.erb~
	deleted:    shoperw/app/views/shoperw/categories/new.html.erb
	deleted:    shoperw/app/views/shoperw/categories/new.html.erb~
	deleted:    shoperw/app/views/shoperw/categories/show.html.erb
	deleted:    shoperw/app/views/shoperw/categories/show.html.erb~
	deleted:    shoperw/app/views/shoperw/items/_form.html.erb
	deleted:    shoperw/app/views/shoperw/items/_form.html.erb~
	deleted:    shoperw/app/views/shoperw/items/edit.html.erb
	deleted:    shoperw/app/views/shoperw/items/edit.html.erb~
	deleted:    shoperw/app/views/shoperw/items/index.html.erb
	deleted:    shoperw/app/views/shoperw/items/index.html.erb~
	deleted:    shoperw/app/views/shoperw/items/new.html.erb
	deleted:    shoperw/app/views/shoperw/items/new.html.erb~
	deleted:    shoperw/app/views/shoperw/items/show.html.erb
	deleted:    shoperw/app/views/shoperw/items/show.html.erb~
	deleted:    shoperw/bin/rails
	deleted:    shoperw/config/routes.rb
	deleted:    shoperw/config/routes.rb~
	deleted:    shoperw/db/migrate/20140921193802_create_shoperw_categories.rb
	deleted:    shoperw/db/migrate/20140921193948_create_shoperw_items.rb
	deleted:    shoperw/lib/shoperw.rb
	deleted:    shoperw/lib/shoperw/engine.rb
	deleted:    shoperw/lib/shoperw/engine.rb~
	deleted:    shoperw/lib/shoperw/version.rb
	deleted:    shoperw/lib/tasks/shoperw_tasks.rake
	deleted:    shoperw/shoperw.gemspec
	deleted:    shoperw/shoperw.gemspec~
	deleted:    shoperw/test/controllers/shoperw/categories_controller_test.rb
	deleted:    shoperw/test/controllers/shoperw/items_controller_test.rb
	deleted:    shoperw/test/dummy/README.rdoc
	deleted:    shoperw/test/dummy/Rakefile
	deleted:    shoperw/test/dummy/app/assets/images/.keep
	deleted:    shoperw/test/dummy/app/assets/javascripts/application.js
	deleted:    shoperw/test/dummy/app/assets/stylesheets/application.css
	deleted:    shoperw/test/dummy/app/controllers/application_controller.rb
	deleted:    shoperw/test/dummy/app/controllers/concerns/.keep
	deleted:    shoperw/test/dummy/app/helpers/application_helper.rb
	deleted:    shoperw/test/dummy/app/mailers/.keep
	deleted:    shoperw/test/dummy/app/models/.keep
	deleted:    shoperw/test/dummy/app/models/concerns/.keep
	deleted:    shoperw/test/dummy/app/views/layouts/application.html.erb
	deleted:    shoperw/test/dummy/bin/bundle
	deleted:    shoperw/test/dummy/bin/rails
	deleted:    shoperw/test/dummy/bin/rake
	deleted:    shoperw/test/dummy/config.ru
	deleted:    shoperw/test/dummy/config/application.rb
	deleted:    shoperw/test/dummy/config/boot.rb
	deleted:    shoperw/test/dummy/config/database.yml
	deleted:    shoperw/test/dummy/config/environment.rb
	deleted:    shoperw/test/dummy/config/environments/development.rb
	deleted:    shoperw/test/dummy/config/environments/production.rb
	deleted:    shoperw/test/dummy/config/environments/test.rb
	deleted:    shoperw/test/dummy/config/initializers/assets.rb
	deleted:    shoperw/test/dummy/config/initializers/backtrace_silencers.rb
	deleted:    shoperw/test/dummy/config/initializers/cookies_serializer.rb
	deleted:    shoperw/test/dummy/config/initializers/filter_parameter_logging.rb
	deleted:    shoperw/test/dummy/config/initializers/inflections.rb
	deleted:    shoperw/test/dummy/config/initializers/mime_types.rb
	deleted:    shoperw/test/dummy/config/initializers/session_store.rb
	deleted:    shoperw/test/dummy/config/initializers/wrap_parameters.rb
	deleted:    shoperw/test/dummy/config/locales/en.yml
	deleted:    shoperw/test/dummy/config/routes.rb
	deleted:    shoperw/test/dummy/config/secrets.yml
	deleted:    shoperw/test/dummy/db/schema.rb
	deleted:    shoperw/test/dummy/lib/assets/.keep
	deleted:    shoperw/test/dummy/log/.keep
	deleted:    shoperw/test/dummy/public/404.html
	deleted:    shoperw/test/dummy/public/422.html
	deleted:    shoperw/test/dummy/public/500.html
	deleted:    shoperw/test/dummy/public/favicon.ico
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/1/lumia_930.jpg
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/1/thumb_lumia_930.jpg
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/2/lumia_930.jpg
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/2/thumb_lumia_930.jpg
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/3/4958968816_334bce1a1f_o.jpg
	deleted:    shoperw/test/dummy/public/uploads/shoperw/item/image/3/thumb_4958968816_334bce1a1f_o.jpg
	deleted:    shoperw/test/fixtures/shoperw/categories.yml
	deleted:    shoperw/test/fixtures/shoperw/items.yml
	deleted:    shoperw/test/helpers/shoperw/categories_helper_test.rb
	deleted:    shoperw/test/helpers/shoperw/items_helper_test.rb
	deleted:    shoperw/test/integration/navigation_test.rb
	deleted:    shoperw/test/models/shoperw/category_test.rb
	deleted:    shoperw/test/models/shoperw/item_test.rb
	deleted:    shoperw/test/shoperw_test.rb
	deleted:    shoperw/test/test_helper.rb
	deleted:    ssh/ssh-ruby
	deleted:    ssh/ssh-ruby.pub
Merge branch 'gspan'

Conflicts:
	a.txt
	deleted:    a.txt
	new file:   README.md
	new file:   a.txt
	new file:   b.txt
	new file:   readMe.txt
	new file:   shop/.gitignore
	new file:   shop/Gemfile
	new file:   shop/Gemfile.lock
	new file:   shop/README.rdoc
	new file:   shop/Rakefile
	new file:   shop/app/assets/images/.keep
	new file:   shop/app/assets/javascripts/application.js
	new file:   shop/app/assets/javascripts/articles.js.coffee
	new file:   shop/app/assets/javascripts/bootstrap.js.coffee
	new file:   shop/app/assets/javascripts/home.js.coffee
	new file:   shop/app/assets/stylesheets/application.css
	new file:   shop/app/assets/stylesheets/articles.css.scss
	new file:   shop/app/assets/stylesheets/bootstrap_and_overrides.css.less
	new file:   shop/app/assets/stylesheets/home.css.scss
	new file:   shop/app/assets/stylesheets/scaffolds.css.scss
	new file:   shop/app/controllers/application_controller.rb
	new file:   shop/app/controllers/articles_controller.rb
	new file:   shop/app/controllers/concerns/.keep
	new file:   shop/app/controllers/home_controller.rb
	new file:   shop/app/helpers/application_helper.rb
	new file:   shop/app/helpers/articles_helper.rb
	new file:   shop/app/helpers/home_helper.rb
	new file:   shop/app/mailers/.keep
	new file:   shop/app/models/.keep
	new file:   shop/app/models/article.rb
	new file:   shop/app/models/concerns/.keep
	new file:   shop/app/models/user.rb
	new file:   shop/app/views/application/index.html.erb
	new file:   shop/app/views/articles/_form.html.erb
	new file:   shop/app/views/articles/edit.html.erb
	new file:   shop/app/views/articles/index.html.erb
	new file:   shop/app/views/articles/index.json.jbuilder
	new file:   shop/app/views/articles/new.html.erb
	new file:   shop/app/views/articles/show.html.erb
	new file:   shop/app/views/articles/show.json.jbuilder
	new file:   shop/app/views/layouts/application.html.erb
	new file:   shop/app/views/layouts/categories.html.erb
	new file:   shop/bin/bundle
	new file:   shop/bin/rails
	new file:   shop/bin/rake
	new file:   shop/bin/spring
	new file:   shop/config.ru
	new file:   shop/config/application.rb
	new file:   shop/config/boot.rb
	new file:   shop/config/database.yml
	new file:   shop/config/environment.rb
	new file:   shop/config/environments/development.rb
	new file:   shop/config/environments/production.rb
	new file:   shop/config/environments/test.rb
	new file:   shop/config/initializers/assets.rb
	new file:   shop/config/initializers/backtrace_silencers.rb
	new file:   shop/config/initializers/cookies_serializer.rb
	new file:   shop/config/initializers/devise.rb
	new file:   shop/config/initializers/filter_parameter_logging.rb
	new file:   shop/config/initializers/inflections.rb
	new file:   shop/config/initializers/mime_types.rb
	new file:   shop/config/initializers/session_store.rb
	new file:   shop/config/initializers/wrap_parameters.rb
	new file:   shop/config/locales/devise.en.yml
	new file:   shop/config/locales/en.bootstrap.yml
	new file:   shop/config/locales/en.yml
	new file:   shop/config/routes.rb
	new file:   shop/config/secrets.yml
	new file:   shop/db/development.sqlite3
	new file:   shop/db/migrate/20140923134526_create_articles.rb
	new file:   shop/db/migrate/20140923140159_create_shoperw_categories.shoperw.rb
	new file:   shop/db/migrate/20140923140160_create_shoperw_items.shoperw.rb
	new file:   shop/db/migrate/20140923153950_devise_create_users.rb
	new file:   shop/db/schema.rb
	new file:   shop/db/seeds.rb
	new file:   shop/db/test.sqlite3
	new file:   shop/lib/assets/.keep
	new file:   shop/lib/tasks/.keep
	new file:   shop/log/.keep
	new file:   shop/public/404.html
	new file:   shop/public/422.html
	new file:   shop/public/500.html
	new file:   shop/public/favicon.ico
	new file:   shop/public/robots.txt
	new file:   shop/public/uploads/shoperw/item/image/2/iphone-4s-devices.jpg
	new file:   shop/public/uploads/shoperw/item/image/2/thumb_iphone-4s-devices.jpg
	new file:   shop/public/uploads/shoperw/item/image/3/lumia_930._2.jpg
	new file:   shop/public/uploads/shoperw/item/image/3/thumb_lumia_930._2.jpg
	new file:   shop/public/uploads/shoperw/item/image/4/sony.jpg
	new file:   shop/public/uploads/shoperw/item/image/4/thumb_sony.jpg
	new file:   shop/public/uploads/shoperw/item/image/5/lumia_930._2.jpg
	new file:   shop/public/uploads/shoperw/item/image/5/thumb_lumia_930._2.jpg
	new file:   shop/test/controllers/.keep
	new file:   shop/test/controllers/articles_controller_test.rb
	new file:   shop/test/controllers/home_controller_test.rb
	new file:   shop/test/fixtures/.keep
	new file:   shop/test/fixtures/articles.yml
	new file:   shop/test/fixtures/users.yml
	new file:   shop/test/helpers/.keep
	new file:   shop/test/helpers/articles_helper_test.rb
	new file:   shop/test/helpers/home_helper_test.rb
	new file:   shop/test/integration/.keep
	new file:   shop/test/mailers/.keep
	new file:   shop/test/models/.keep
	new file:   shop/test/models/article_test.rb
	new file:   shop/test/models/user_test.rb
	new file:   shop/test/test_helper.rb
	new file:   shop/vendor/assets/javascripts/.keep
	new file:   shop/vendor/assets/stylesheets/.keep
	new file:   shoperw/.gitignore
	new file:   shoperw/Gemfile
	new file:   shoperw/Gemfile.lock
	new file:   shoperw/Gemfile~
	new file:   shoperw/MIT-LICENSE
	new file:   shoperw/README.rdoc
	new file:   shoperw/Rakefile
	new file:   shoperw/app/assets/images/shoperw/.keep
	new file:   shoperw/app/assets/javascripts/application.js
	new file:   shoperw/app/assets/javascripts/shoperw/application.js
	new file:   shoperw/app/assets/javascripts/shoperw/categories.js
	new file:   shoperw/app/assets/javascripts/shoperw/items.js
	new file:   shoperw/app/assets/stylesheets/application.css
	new file:   shoperw/app/assets/stylesheets/scaffold.css
	new file:   shoperw/app/assets/stylesheets/shoperw/application.css
	new file:   shoperw/app/assets/stylesheets/shoperw/categories.css
	new file:   shoperw/app/assets/stylesheets/shoperw/items.css
	new file:   shoperw/app/controllers/shoperw/application_controller.rb
	new file:   shoperw/app/controllers/shoperw/application_controller.rb~
	new file:   shoperw/app/controllers/shoperw/categories_controller.rb
	new file:   shoperw/app/controllers/shoperw/items_controller.rb
	new file:   shoperw/app/controllers/shoperw/items_controller.rb~
	new file:   shoperw/app/helpers/shoperw/application_helper.rb
	new file:   shoperw/app/helpers/shoperw/categories_helper.rb
	new file:   shoperw/app/helpers/shoperw/items_helper.rb
	new file:   shoperw/app/models/shoperw/category.rb
	new file:   shoperw/app/models/shoperw/category.rb~
	new file:   shoperw/app/models/shoperw/item.rb
	new file:   shoperw/app/models/shoperw/item.rb~
	new file:   shoperw/app/uploaders/shoperw/item_image_uploader.rb
	new file:   shoperw/app/uploaders/shoperw/item_image_uploader.rb~
	new file:   shoperw/app/views/shoperw/categories/_form.html.erb
	new file:   shoperw/app/views/shoperw/categories/edit.html.erb
	new file:   shoperw/app/views/shoperw/categories/edit.html.erb~
	new file:   shoperw/app/views/shoperw/categories/index.html.erb
	new file:   shoperw/app/views/shoperw/categories/index.html.erb~
	new file:   shoperw/app/views/shoperw/categories/new.html.erb
	new file:   shoperw/app/views/shoperw/categories/new.html.erb~
	new file:   shoperw/app/views/shoperw/categories/show.html.erb
	new file:   shoperw/app/views/shoperw/categories/show.html.erb~
	new file:   shoperw/app/views/shoperw/items/_form.html.erb
	new file:   shoperw/app/views/shoperw/items/_form.html.erb~
	new file:   shoperw/app/views/shoperw/items/edit.html.erb
	new file:   shoperw/app/views/shoperw/items/edit.html.erb~
	new file:   shoperw/app/views/shoperw/items/index.html.erb
	new file:   shoperw/app/views/shoperw/items/index.html.erb~
	new file:   shoperw/app/views/shoperw/items/new.html.erb
	new file:   shoperw/app/views/shoperw/items/new.html.erb~
	new file:   shoperw/app/views/shoperw/items/show.html.erb
	new file:   shoperw/app/views/shoperw/items/show.html.erb~
	new file:   shoperw/bin/rails
	new file:   shoperw/config/routes.rb
	new file:   shoperw/config/routes.rb~
	new file:   shoperw/db/migrate/20140921193802_create_shoperw_categories.rb
	new file:   shoperw/db/migrate/20140921193948_create_shoperw_items.rb
	new file:   shoperw/lib/shoperw.rb
	new file:   shoperw/lib/shoperw/engine.rb
	new file:   shoperw/lib/shoperw/engine.rb~
	new file:   shoperw/lib/shoperw/version.rb
	new file:   shoperw/lib/tasks/shoperw_tasks.rake
	new file:   shoperw/shoperw.gemspec
	new file:   shoperw/shoperw.gemspec~
	new file:   shoperw/test/controllers/shoperw/categories_controller_test.rb
	new file:   shoperw/test/controllers/shoperw/items_controller_test.rb
	new file:   shoperw/test/dummy/README.rdoc
	new file:   shoperw/test/dummy/Rakefile
	new file:   shoperw/test/dummy/app/assets/images/.keep
	new file:   shoperw/test/dummy/app/assets/javascripts/application.js
	new file:   shoperw/test/dummy/app/assets/stylesheets/application.css
	new file:   shoperw/test/dummy/app/controllers/application_controller.rb
	new file:   shoperw/test/dummy/app/controllers/concerns/.keep
	new file:   shoperw/test/dummy/app/helpers/application_helper.rb
	new file:   shoperw/test/dummy/app/mailers/.keep
	new file:   shoperw/test/dummy/app/models/.keep
	new file:   shoperw/test/dummy/app/models/concerns/.keep
	new file:   shoperw/test/dummy/app/views/layouts/application.html.erb
	new file:   shoperw/test/dummy/bin/bundle
	new file:   shoperw/test/dummy/bin/rails
	new file:   shoperw/test/dummy/bin/rake
	new file:   shoperw/test/dummy/config.ru
	new file:   shoperw/test/dummy/config/application.rb
	new file:   shoperw/test/dummy/config/boot.rb
	new file:   shoperw/test/dummy/config/database.yml
	new file:   shoperw/test/dummy/config/environment.rb
	new file:   shoperw/test/dummy/config/environments/development.rb
	new file:   shoperw/test/dummy/config/environments/production.rb
	new file:   shoperw/test/dummy/config/environments/test.rb
	new file:   shoperw/test/dummy/config/initializers/assets.rb
	new file:   shoperw/test/dummy/config/initializers/backtrace_silencers.rb
	new file:   shoperw/test/dummy/config/initializers/cookies_serializer.rb
	new file:   shoperw/test/dummy/config/initializers/filter_parameter_logging.rb
	new file:   shoperw/test/dummy/config/initializers/inflections.rb
	new file:   shoperw/test/dummy/config/initializers/mime_types.rb
	new file:   shoperw/test/dummy/config/initializers/session_store.rb
	new file:   shoperw/test/dummy/config/initializers/wrap_parameters.rb
	new file:   shoperw/test/dummy/config/locales/en.yml
	new file:   shoperw/test/dummy/config/routes.rb
	new file:   shoperw/test/dummy/config/secrets.yml
	new file:   shoperw/test/dummy/db/schema.rb
	new file:   shoperw/test/dummy/lib/assets/.keep
	new file:   shoperw/test/dummy/log/.keep
	new file:   shoperw/test/dummy/public/404.html
	new file:   shoperw/test/dummy/public/422.html
	new file:   shoperw/test/dummy/public/500.html
	new file:   shoperw/test/dummy/public/favicon.ico
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/1/lumia_930.jpg
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/1/thumb_lumia_930.jpg
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/2/lumia_930.jpg
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/2/thumb_lumia_930.jpg
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/3/4958968816_334bce1a1f_o.jpg
	new file:   shoperw/test/dummy/public/uploads/shoperw/item/image/3/thumb_4958968816_334bce1a1f_o.jpg
	new file:   shoperw/test/fixtures/shoperw/categories.yml
	new file:   shoperw/test/fixtures/shoperw/items.yml
	new file:   shoperw/test/helpers/shoperw/categories_helper_test.rb
	new file:   shoperw/test/helpers/shoperw/items_helper_test.rb
	new file:   shoperw/test/integration/navigation_test.rb
	new file:   shoperw/test/models/shoperw/category_test.rb
	new file:   shoperw/test/models/shoperw/item_test.rb
	new file:   shoperw/test/shoperw_test.rb
	new file:   shoperw/test/test_helper.rb
	new file:   ssh/ssh-ruby
	new file:   ssh/ssh-ruby.pub
	new file:   .idea/scopes/scope_settings.xml
	deleted:    shop/app/assets/javascripts/articles.js.coffee
	deleted:    shop/app/assets/javascripts/home.js.coffee
	deleted:    shop/app/assets/stylesheets/articles.css.scss
	deleted:    shop/app/assets/stylesheets/home.css.scss
	deleted:    shop/app/controllers/articles_controller.rb
	deleted:    shop/app/controllers/home_controller.rb
	deleted:    shop/app/helpers/articles_helper.rb
	deleted:    shop/app/helpers/home_helper.rb
	deleted:    shop/app/models/article.rb
	deleted:    shop/app/models/user.rb
	deleted:    shop/app/views/articles/_form.html.erb
	deleted:    shop/app/views/articles/edit.html.erb
	deleted:    shop/app/views/articles/index.html.erb
	deleted:    shop/app/views/articles/index.json.jbuilder
	deleted:    shop/app/views/articles/new.html.erb
	deleted:    shop/app/views/articles/show.html.erb
	deleted:    shop/app/views/articles/show.json.jbuilder
	deleted:    shop/app/views/layouts/categories.html.erb
	modified:   shop/config/routes.rb
	deleted:    shop/db/migrate/20140923134526_create_articles.rb
	deleted:    shop/db/migrate/20140923153950_devise_create_users.rb
	deleted:    shop/test/controllers/articles_controller_test.rb
	deleted:    shop/test/controllers/home_controller_test.rb
	deleted:    shop/test/fixtures/articles.yml
	deleted:    shop/test/fixtures/users.yml
	deleted:    shop/test/helpers/articles_helper_test.rb
	deleted:    shop/test/helpers/home_helper_test.rb
	deleted:    shop/test/models/article_test.rb
	deleted:    shop/test/models/user_test.rb

	.idea/workspace.xml
	deleted:    .idea/scopes/scope_settings.xml
Merge branch 'dhell' of https://github.com/DavidHellbrueck/ruby into dhell

Conflicts:
	shop/app/views/layouts/application.html.erb
	shop/db/development.sqlite3