Added .gitignore and html subdir
Merge branch 'newbranch'