html and script combined
corrections
merge conflicts fixed
Merge pull request #7 from magicgrl111/development

merging of files