Added gitignore
Merge test html file