Oh my html
OK
elimination of conflict of index.html
Merge pull request #11 from ychubachi/summer

Summer