Few Changes that should be overwritten
Merge branch 'master' of https://github.com/pierfier/APCompSciAsignments

Conflicts:
	Asignment_10a_Project/DrawRectanglesFrame.java
	Asignment_10a_Project/Pentagon.class
	Asignment_10a_Project/Shape.class
	Asignment_10a_Project/Shape.ctxt
	Asignment_10a_Project/Shape.java
	Asignment_10a_Project/package.bluej
Updated the didCollide methods

Implemented to all the object classes