adding 3 files
add testpush.md
pushing testpush.txt
fix merge