fucking conflicts
Merge branch 'master' of https://github.com/smonette/microblog_lab into posts-controller-views
Merge branch 'master' of https://github.com/smonette/microblog_lab into posts-controller-views
adding posts
Merge pull request #21 from smonette/posts-controller-views

Posts controller views