cleaning html and making other tests working that used hardcoded strings
solving a merge conflict
Merge pull request #28 from rubymonsters/i18n

I18n