Adding some documentation and more tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	OOP Testing/src/Cat.java