added new file edit.txt
HEY HELLO
Rosie And Janine
modified2
added file
Modified json file
Added file3 and mofied ekek.(1231)
Modified style.css
Merge branch 'jvbatabranch'

* jvbatabranch:
  added new file edit.txt
Merge branch 'master' of https://github.com/OJTgz/project