fix merge conflict, fix categories on projects, styling on projects, add destroy action to user projects, and link to user dashboard on menu