add analytics
add keywords and descriptions
add twitter card
fix merge conflict