mmmmmmmmmmm
ooooooooo
Merge https://github.com/Mailis/assignment-two

Conflicts:
	Gemfile
	Gemfile.lock
	Gemfile~
	app/controllers/comments_controller.rb~
	app/controllers/posts_controller.rb
	app/controllers/posts_controller.rb~
	app/views/posts/index.html.erb
	app/views/posts/index.html.erb~
	app/views/posts/show.html.erb
	app/views/posts/show.html.erb~
	app/views/user_mailer/teavitus_email.html.erb
	app/views/user_mailer/teavitus_email.html.erb~
	config/application.rb
	config/environments/development.rb
	config/environments/development.rb~
	config/environments/production.rb~
	config/environments/test.rb
	config/environments/test.rb~
	config/initializers/secret_token.rb
	config/routes.rb
	config/routes.rb~
	db/schema.rb
	test/fixtures/posts.yml
	test/functional/posts_controller_test.rb