first commit
business html, cuisine html, freetibet html
fixed merge conflicts