create .htaccess
Merge branch 'modify-html' into lassi
modify gitignore
modify gitignore 2
Merge branch 'lassi'