more html files
 solve conflicts
Merge pull request #11 from leplay/master

 more html files