Initial commit with new blogger
Merge branch 'master' of github.com:josh86/blogger

Conflicts:
	Gemfile.lock
	app/controllers/articles_controller.rb
	app/models/article.rb
	app/views/articles/index.html.erb
	app/views/articles/show.html.erb
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	script/rails
	test/fixtures/articles.yml