Merge branch 'feature/3_homepage'
add user 'to_s' function
Merge branch 'master' into feature/4_post_page
Merge branch 'feature/4_post_page' of github.com-gerov:savayg/buzzstarter-training into feature/4_post_page
[#4] Fixed schema
Merge branch 'feature/4_post_page' into feature/5_users_login

Conflicts:
	app/models/user.rb
Merge branch 'feature/5_users_login' into feature/6_blog_post_comments

Conflicts:
	app/views/landing/index.json.rabl
	app/views/landing/post.html.erb