OOP
Merge branch 'master' of https://github.com/mirchev1977/000Contents

Conflicts:
	README.md~