added new file edit.txt
Merge branch 'jvbatabranch'

* jvbatabranch:
  added new file edit.txt