First commit.
Merge https://github.com/timombasa/objectOrientation

Conflicts:
	README.md