fix merge conflicts
fix merge conflicts
fix merges
add user form
delete microposts.js.coffee