Merge branch 'copy3'

Conflicts:
.gitignore
.ruby-gemset
.ruby-version
Gemfile
Gemfile.lock
README.rdoc
Rakefile
app/assets/images/.keep
app/assets/javascripts/application.js
app/assets/javascripts/comments.js.coffee
app/assets/javascripts/index.js.coffee
app/assets/javascripts/posts.js.coffee
app/assets/javascripts/welcome.js.coffee
app/assets/stylesheets/application.css
app/assets/stylesheets/comments.css.scss
app/assets/stylesheets/index.css.scss
app/assets/stylesheets/posts.css.scss
app/assets/stylesheets/welcome.css.scss
app/controllers/application_controller.rb
app/controllers/comments_controller.rb
app/controllers/concerns/.keep
app/controllers/posts_controller.rb
app/controllers/welcome_controller.rb
app/helpers/application_helper.rb
app/helpers/comments_helper.rb
app/helpers/index_helper.rb
app/helpers/posts_helper.rb
app/helpers/welcome_helper.rb
app/mailers/.keep
app/models/.keep
app/models/comment.rb
app/models/concerns/.keep
app/models/post.rb
app/views/layouts/application.html.erb
app/views/posts/_bottom.html.erb
app/views/posts/_form.html.erb
app/views/posts/edit.html.erb
app/views/posts/index.html.erb
app/views/posts/new.html.erb
app/views/posts/show.html.erb
app/views/welcome/index.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/filter_parameter_logging.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/migrate/20140307002504_create_posts.rb
db/migrate/20140309230723_create_comments.rb
db/schema.rb
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/controllers/comments_controller_test.rb
test/controllers/index_controller_test.rb
test/controllers/posts_controller_test.rb
test/controllers/welcome_controller_test.rb
test/fixtures/.keep
test/fixtures/comments.yml
test/fixtures/posts.yml
test/helpers/.keep
test/helpers/comments_helper_test.rb
test/helpers/index_helper_test.rb
test/helpers/posts_helper_test.rb
test/helpers/welcome_helper_test.rb
test/integration/.keep
test/mailers/.keep
test/models/.keep
test/models/comment_test.rb
test/models/post_test.rb
test/test_helper.rb
vendor/assets/javascripts/.keep
vendor/assets/stylesheets/.keep