wash
adeed to tres
added newwow.txt
pull contents to clean and reset branch

Merge branches 'testing' and 'testing' of https://github.com/sebastianduchene/NELSI into testing
deleted files from branch
fixed readme conf
Merge branch 'master' into testing

Conflicts:
	README.md
	README.md~
aded feature
wowwo
ssss
Merge branch 'testing'
reastated all files