Merge branch 'Sherry' of https://github.com/Arrowny/Minipaint_redux into Sherry

Conflicts:
	Assignment1_minipaint_redux/.cproject
	Assignment1_minipaint_redux/BBox/BBox.cpp
	Assignment1_minipaint_redux/BBox/BBox.h
	Assignment1_minipaint_redux/object_folder/Circle.cpp
	Assignment1_minipaint_redux/object_folder/Circle.h
	Assignment1_minipaint_redux/object_folder/object.cpp