Initial commit
	new file:   .gitignore
	new file:   .rspec
	new file:   Gemfile
	new file:   Gemfile.lock
	new file:   README.rdoc
	new file:   Rakefile
	new file:   app/assets/images/rails.png
	new file:   app/assets/javascripts/application.js
	new file:   app/assets/stylesheets/application.css
	new file:   app/controllers/application_controller.rb
	new file:   app/helpers/application_helper.rb
	new file:   app/mailers/.gitkeep
	new file:   app/models/.gitkeep
	new file:   app/views/layouts/application.html.erb
	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/backtrace_silencers.rb
	new file:   config/initializers/inflections.rb
	new file:   config/initializers/mime_types.rb
	new file:   config/initializers/secret_token.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:   db/seeds.rb
	new file:   doc/README_FOR_APP
	new file:   lib/assets/.gitkeep
	new file:   lib/tasks/.gitkeep
	new file:   log/.gitkeep
	new file:   public/404.html
	new file:   public/422.html
	new file:   public/500.html
	new file:   public/favicon.ico
	new file:   public/index.html
	new file:   public/robots.txt
	new file:   script/rails
	new file:   spec/spec_helper.rb
	new file:   vendor/assets/javascripts/.gitkeep
	new file:   vendor/assets/stylesheets/.gitkeep
	new file:   vendor/plugins/.gitkeep
Replacing README.rdoc
	modified:   README.rdoc
Merge branch 'master' of https://github.com/bisbic/sample_app