merge
Merge branch 'user-microposts'
Fixing an incorrect partial, reverting to more verbose (albeit functional) version of my code