test ; or :

test commit in 2 ways
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
remove readme