stashing crap
Add user microposts
resolved conflicts hopefully