add cat.html
add cat.html in cat branch
merge conflicts fixed