nothing
Merge remote-tracking branch 'origin/David' into Sherry
Merge remote-tracking branch 'origin/David' into Sherry
delete
add line object
add include
Merge remote-tracking branch 'origin/David' into Sherry
add draw line and circle files
libraries
delete wrong test folder
add circle.cpp
nothing
ok
lol
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
DO IT