add word on html for hangman
fix merge issues