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
getting new post form to work, and show
Merge branch 'master' of https://github.com/smonette/microblog_lab into posts-controller-views
getting the new post form working
getting the new post form working
finish testing all associations in terminal
Merge pull request #23 from smonette/test_associations_models

finish testing all associations in terminal
Merge pull request #22 from smonette/posts-controller-views

Posts controller views
getting update page working THANK YOU PALMER!
add seed data
Merge pull request #24 from smonette/posts-controller-views

getting update page working THANK YOU PALMER!
Merge pull request #25 from smonette/seed_data

add seed data
Merge pull request #26 from smonette/master

pushing to get seeds