Second commit
Merge branch 'master' of https://github.com/ghembo/blogger

Conflicts:
	app/controllers/articles_controller.rb
	app/helpers/articles_helper.rb
	app/models/article.rb
	app/views/articles/_form.html.haml
	app/views/articles/show.html.haml
	config/routes.rb
	db/schema.rb