add tags and category
add about page
fix conflict