Added simple javascript to collect text from textbox and put it in an array
Fixed merge conflicts