modified:   README.md
Merge branch 'master' of github.com:ojenning/OTRS-FileManager3

Conflicts:
	README.md

	deleted:    README.md
	new file:   README.md