text field edits
Merge pull request #6 from cwnidog/craig-new

text field edits
resolving merge conflicts