deleted:    app/assets/javascripts/articles.js.coffee
	deleted:    app/assets/stylesheets/application.css
	deleted:    app/assets/stylesheets/articles.css.scss
	deleted:    app/controllers/articles_controller.rb
	deleted:    app/helpers/articles_helper.rb
	deleted:    app/models/article.rb
	deleted:    app/views/articles/_form.html.erb
	deleted:    app/views/articles/edit.html.erb
	deleted:    app/views/articles/index.html.erb
	deleted:    app/views/articles/new.html.erb
	deleted:    app/views/articles/show.html.erb
	deleted:    public/index.html
	deleted:    test/fixtures/.gitkeep
	deleted:    test/fixtures/articles.yml
	deleted:    test/functional/.gitkeep
	deleted:    test/functional/articles_controller_test.rb
	deleted:    test/integration/.gitkeep
	deleted:    test/performance/browsing_test.rb
	deleted:    test/test_helper.rb
	deleted:    test/unit/.gitkeep
	deleted:    test/unit/article_test.rb
	deleted:    test/unit/helpers/articles_helper_test.rb

	modified:   config/routes.rb
	modified:   config/routes.rb
	deleted:    db/migrate/20131214230332_create_articles.rb
Merge branch 'master' of https://github.com/kasabian/blog