test
Merge branch 'master' of github.com:vbokser/railsinstaller_osx_demo

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/images/rails.png
	app/assets/javascripts/application.js
	app/assets/javascripts/welcome.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/welcome.css.scss
	app/controllers/application_controller.rb
	app/controllers/welcome_controller.rb
	app/helpers/application_helper.rb
	app/helpers/welcome_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
	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/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	test/fixtures/.gitkeep
	test/functional/.gitkeep
	test/functional/welcome_controller_test.rb
	test/integration/.gitkeep
	test/performance/browsing_test.rb
	test/test_helper.rb
	test/unit/.gitkeep
	test/unit/helpers/welcome_helper_test.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep