on mac
removed .DS_Store
Changed the Readme.md
Merge github.com:plustek/Pinteresting-

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