Refactored demo to use the rectangle class to demonstrate overlapping

Refactored demo to use the rectangle class to demonstrate overlapping rather than creating an extra OverlapTester class that just makes it a bit more confusing for new users.