Merge branch 'feature/2_admin_posts'
Merge branch 'master' into feature/3_homepage
[#3] PR comments solved.
Merge branch 'feature/3_homepage' into feature/4_post_page

Conflicts:
	.gitignore
	app/assets/javascripts/landing.js.coffee
	app/controllers/landing_controller.rb
	config/routes.rb