ok
lol
iok
updated for windows
more basic commits
basic changes
Merge branch 'DavidWin' of https://github.com/Arrowny/Minipaint_redux into DavidWin

Conflicts:
	Assignment1_minipaint_redux/Test/BBox/BBox.d
	Assignment1_minipaint_redux/Test/BBox/subdir.mk
	Assignment1_minipaint_redux/Test/Canvas.d
	Assignment1_minipaint_redux/Test/GUI.d
	Assignment1_minipaint_redux/Test/makefile
	Assignment1_minipaint_redux/Test/object_folder/object.d
	Assignment1_minipaint_redux/Test/object_folder/subdir.mk
	Assignment1_minipaint_redux/Test/objects.mk
	Assignment1_minipaint_redux/Test/sources.mk
	Assignment1_minipaint_redux/Test/subdir.mk
	Assignment1_minipaint_redux/Test/test_BBox/BBox/subdir.mk
weird commits
Revert "updated for windows"
updated class structure
Merge remote-tracking branch 'origin/DavidWin' into Sherry
not important