Continued working on microposts
Merged Microposts stuff
Merge conflicts